Commit graph

20 commits

Author SHA1 Message Date
Steven Armstrong
3de9b869ac there is no such thing as cdist install in master
remove all traces of it to prevent the ongoing merge issues when using the real thing

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-08-29 21:56:53 +02:00
Nico Schottelius
42bad3dd37 dest, not destination
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-28 16:46:35 +02:00
Nico Schottelius
e6feee14fb Merge branch 'enhance_cache'
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/test/code/__init__.py
	cdist/test/config_install/__init__.py
	cdist/test/explorer/__init__.py
2013-08-28 15:43:03 +02:00
Nico Schottelius
200c15c536 remove debug, ++changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-27 12:46:00 +02:00
Nico Schottelius
74e003d29b +print cdist version on startup + exit_code = 2 for irq
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-21 18:52:35 +02:00
Nico Schottelius
10b27e63ca rename out_path -> out_dir for consistency
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:21:36 +02:00
Nico Schottelius
d1708c78b6 refactoring
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 01:38:28 +02:00
Nico Schottelius
eaf1721212 begin to migrate to '--output-base-path', shrink context
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:52:15 +02:00
Nico Schottelius
83c981f477 begin to implement -C --cache-dir
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:03:57 +02:00
Nico Schottelius
32f878ad00 update docs, document exit code bug
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-12 11:42:00 +02:00
Nico Schottelius
0eb67a00f5 exit = 2 if ctrl-c is pressed, cleanup
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 18:49:47 +02:00
Nico Schottelius
c793825edb re-arrange REMOTE_COPY/EXEC for Shell use
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 17:52:34 +02:00
Nico Schottelius
2403fc59ee refactor commandline: merge into its own class (and add first shell code)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 09:24:10 +02:00
Nico Schottelius
9195c9b8e8 Remove ugly argumentparser bug
Before:

[21:09] bento:~% cdist
Traceback (most recent call last):
  File "/home/users/nico/p/cdist/cdist/bin/../scripts/cdist", line 232, in <module>
    commandline()
  File "/home/users/nico/p/cdist/cdist/bin/../scripts/cdist", line 106, in commandline
    args.func(args)
AttributeError: 'Namespace' object has no attribute 'func'

After:

[21:11] bento:~% cdist
usage: cdist [-h] [-d] [-v] [-V] {banner,config} ...

cdist 2.1.1-48-gfd72c60

optional arguments:
  -h, --help       show this help message and exit
  -d, --debug      Set log level to debug
  -v, --verbose    Set log level to info, be more verbose
  -V, --version    Show version

Commands:
  {banner,config}

Get cdist at http://www.nico.schottelius.org/software/cdist/
[21:11] bento:~%

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-07 21:10:57 +02:00
Nico Schottelius
51c8687455 re-add object_prepare, use new run() method
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 10:08:23 +02:00
Nico Schottelius
a265d87037 begin dry run in command line
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-02 16:41:16 +02:00
Nico Schottelius
aedb3669c7 print hint if initial manifest is missing
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-06 21:46:02 +01:00
Nico Schottelius
6ecfb28d93 name parameter correctly add_conf_dirs
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-01 14:14:52 +01:00
Nico Schottelius
813651c14b allow passing conf_dir instead of cdist-home
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 15:59:02 +01:00
Nico Schottelius
10b6c31ac8 Rename cdist.py to scripts/cdist to avoid self import
naming cdist cdist.py and running import cdist, imports itself and thus raises an interesting error:

(virtualenv)[7:47] brief:virtualenv% cdist.py
Traceback (most recent call last):
  File "<frozen importlib._bootstrap>", line 1512, in _find_and_load_unlocked
AttributeError: 'module' object has no attribute '__path__'

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 230, in <module>
    commandline()
  File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 27, in commandline
    import cdist.banner
ImportError: No module named 'cdist.banner'; cdist is not a package

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "/home/users/nico/oeffentlich/rechner/projekte/cdist/virtualenv/bin/cdist.py", line 235, in <module>
    except cdist.Error as e:
AttributeError: 'module' object has no attribute 'Error'

Also described on

    http://www.velocityreviews.com/forums/t953596-error-executing-import-html-parser-from-a-script.html

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-10-30 11:47:16 +01:00
Renamed from cdist.py (Browse further)