Commit graph

3456 commits

Author SHA1 Message Date
Nico Schottelius
af8f944aaf package_dir not needed anymore
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 23:47:32 +02:00
Nico Schottelius
3cf59fdf9a always use dynamic version - on shipping included generated version
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 23:45:56 +02:00
Nico Schottelius
136bb01a67 correct placement in build script
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 23:43:12 +02:00
Nico Schottelius
91c1374657 begin restructering for python package
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 23:37:15 +02:00
Nico Schottelius
5d319027d0 Merge branch 'master' into 2.1_pypi_integration
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	.gitignore
	build
2012-10-25 22:35:20 +02:00
Nico Schottelius
d3c7abbaba ignore static version
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 22:32:05 +02:00
Nico Schottelius
637e4b28cb include base for dynamic and static versioning
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 22:19:27 +02:00
Nico Schottelius
afbfc031f7 begin to split off version information from source
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 19:12:22 +02:00
Nico Schottelius
d20ae0596d pypi cleanups
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 19:07:50 +02:00
Nico Schottelius
37db1e8c2f retry MANIFEST.in, when deleting cache before
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 18:47:48 +02:00
Nico Schottelius
65128e4bcf re-indent
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 18:44:05 +02:00
Nico Schottelius
45a4719fb0 clean before running pypi
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 18:29:49 +02:00
Nico Schottelius
f25989d779 build MANIFEST ourselves
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 18:28:19 +02:00
Nico Schottelius
392ec3c5ed correct link to __file
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:46:19 +02:00
Nico Schottelius
abb384c270 add manifest for distutils
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:43:20 +02:00
Nico Schottelius
814c5e04d9 add initial setup.py
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:42:38 +02:00
Nico Schottelius
c9f728e073 lib/cdist => cdist (pypi)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:21:58 +02:00
Nico Schottelius
6d1e4d06cf doc -> docs (pypi)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-25 17:17:52 +02:00
Nico Schottelius
a221e6a233 Merge branch 'master' into 2.1 2012-10-25 17:01:27 +02:00
Nico Schottelius
5315c41903 Revert "do nothing by default and prevent traceback"
This reverts commit b7a8a84bfc.
2012-10-24 11:16:36 +02:00
Nico Schottelius
8a8192d3d3 Revert "enable what I've committed just before"
This reverts commit 840dbc5fc2.
2012-10-24 11:16:29 +02:00
Nico Schottelius
840dbc5fc2 enable what I've committed just before
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-24 10:22:13 +02:00
Nico Schottelius
b7a8a84bfc do nothing by default and prevent traceback
If not given the function, we get:

aceback (most recent call last):
  File "/home/users/nico/p/cdist/core/bin/cdist", line 243, in <module>
    commandline()
  File "/home/users/nico/p/cdist/core/bin/cdist", line 107, in commandline
    args.func(args)
AttributeError: 'Namespace' object has no attribute 'func'

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-24 10:21:38 +02:00
Nico Schottelius
9228168bc9 update comment
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-18 18:34:30 +02:00
Nico Schottelius
661a8bf831 problems with conflicting types - for documentation
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-18 18:31:41 +02:00
Nico Schottelius
410e0ba8fa Merge branch 'master' into 2.1
Conflicts:
	conf/type/__package/man.text
	conf/type/__package_apt/man.text
	conf/type/__package_luarocks/gencode-remote
	conf/type/__package_luarocks/man.text
	conf/type/__package_pacman/gencode-remote
	conf/type/__package_pacman/man.text
	conf/type/__package_pkg_openbsd/gencode-remote
	conf/type/__package_pkg_openbsd/man.text
	conf/type/__package_rubygem/gencode-remote
	conf/type/__package_rubygem/man.text
	conf/type/__package_yum/gencode-remote
	conf/type/__package_yum/man.text

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-15 15:39:08 +02:00
Nico Schottelius
4cc3baf057 import tag
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-12 09:00:50 +02:00
Nico Schottelius
1c294c72f9 document font used for cdist logo
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-08 17:24:13 +02:00
Nico Schottelius
6eced94035 Merge branch '__package_state_fix' of https://github.com/jdguffey/cdist 2012-10-07 18:48:07 +02:00
Jake Guffey
1fef54ecdf Fix __package* state usage
Removed __package*/parameter/required
Added state to __package*/parameter/optional
Modified man pages for __package*
Added optional check for state parameter
Defaulted state parameter to "present"
2012-10-07 11:51:15 -04:00
Nico Schottelius
61394f3909 correct comment
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-04 10:10:41 +02:00
Nico Schottelius
57adc731c4 ++changes(2.0.15) - Fixes #66
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-02 18:11:16 +02:00
Nico Schottelius
8c0228bbaa allow failing cat on optional parameter
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-02 18:09:52 +02:00
Nico Schottelius
748fc8a258 support installing, even if rvm is already present
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-02 18:06:15 +02:00
Nico Schottelius
62c69c63b5 support root and user rvm
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-02 18:05:47 +02:00
Nico Schottelius
07902f2a0b ++changes(2.0.15)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-01 17:52:19 +02:00
Nico Schottelius
21ca688e63 Merge pull request #99 from jdguffey/__pf_apply
__pf_apply
2012-10-01 08:47:49 -07:00
Nico Schottelius
12e1d16efd Merge pull request #98 from jdguffey/__pf_ruleset
_pf_ruleset
2012-10-01 08:47:35 -07:00
Nico Schottelius
57ed946414 Remove __self variable
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-21 20:25:37 +02:00
Nico Schottelius
3f9213be7e Merge branch 'master' into 2.1 2012-09-21 20:23:06 +02:00
Nico Schottelius
550ff8c727 cleanup reference
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-21 20:23:03 +02:00
Nico Schottelius
5761787b84 remove obsolete reference to tmp_dir
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-21 20:18:50 +02:00
Jake Guffey
9a45333e82 Implement Nico's suggestions
Removed unnecessary code from gencode-remote
2012-09-21 10:11:56 -04:00
Jake Guffey
6afec72232 Implement Nico's suggestions
Modified behavior of cksum explorer to print nothing if the file doesn't exist
Modified gencode-local to reflect cksum's new behavior
Modified gencode-remote to check states explicitly and error on invalid state.
2012-09-21 10:06:16 -04:00
Nico Schottelius
3333df602b change several type to accept only state absent/present
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-21 11:35:56 +02:00
Nico Schottelius
1b80f2806b remove installed/removed state parameters (2.1 cleanup)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-21 11:32:04 +02:00
Nico Schottelius
9fbdfda302 ++changes(2.1.0)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-21 11:13:04 +02:00
Nico Schottelius
bc203df95f update man for 2.1
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-21 11:12:32 +02:00
Nico Schottelius
e82c11cce4 add changes for 2.1 boolean version
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-09-21 11:10:38 +02:00
Nico Schottelius
3140c009d3 Merge branch 'master' into 2.1 2012-09-21 11:09:26 +02:00