fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2424 commits 91 branches 177 tags 18 MiB
Commit graph

462 commits

Author SHA1 Message Date
Nico Schottelius
d21126189c indent/cleanup 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 18:04:13 +02:00
Steven Armstrong
f515e20572 start unittests for Type 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 17:52:38 +02:00
Steven Armstrong
129e47d0c1 Merge remote-tracking branch 'telmich/master' 2011-10-07 17:51:25 +02:00
Steven Armstrong
ae15779c81 -- DeprecationWarning: object.__new__() takes no parameters 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 17:50:53 +02:00
Nico Schottelius
e985c0d697 remove sys.exit from banner 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:38:50 +02:00
Nico Schottelius
cabb5b9ab0 100% test coverage for the banner (feels good, doesn't it?) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:38:10 +02:00
Nico Schottelius
be78955cc6 move banner into cdist module 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:18:39 +02:00
Nico Schottelius
63c9a91bca +whitespace save out only 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:12:06 +02:00
Nico Schottelius
d32aa37fba cleanup context 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:07:31 +02:00
Nico Schottelius
073717e07e some more relative to absolute path changes 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:07:10 +02:00
Nico Schottelius
b5c01f7354 update code to use new _path from object 
and type

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:04:52 +02:00
Nico Schottelius
c6e8f163f5 use variable require, not __require for defining 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:03:38 +02:00
Nico Schottelius
4a1cf3dbf3 -typo 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:02:24 +02:00
Nico Schottelius
35900ae66c make type explorer work 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 17:01:59 +02:00
Nico Schottelius
85873d2fd2 Merge branch 'master' of git://github.com/asteven/cdist 2011-10-07 16:57:41 +02:00
Steven Armstrong
b778c9ff15 absolute path is based on relative path -> does not need another .cdist 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 16:59:52 +02:00
Nico Schottelius
d9bb8e3107 use cdist_type 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:55:19 +02:00
Steven Armstrong
5f4a85f6ad also need .cdist in relative paths 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 16:49:18 +02:00
Nico Schottelius
317390e962 Merge remote-tracking branch 'steven/master' 2011-10-07 16:47:04 +02:00
Steven Armstrong
53737aad3a append .cdist to absolute paths 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 16:46:55 +02:00
Nico Schottelius
10c083894c Merge remote-tracking branch 'steven/master' 2011-10-07 16:45:00 +02:00
Nico Schottelius
e8c9b10227 also use path in emulator 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:44:53 +02:00
Steven Armstrong
cde4d87ab7 Merge remote-tracking branch 'telmich/master' 2011-10-07 16:43:07 +02:00
Nico Schottelius
03226dc5aa more fixes for relative path address 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:36:05 +02:00
Nico Schottelius
fd2fa23564 fix typeexplorer transfer 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:27:15 +02:00
Steven Armstrong
117c950965 Merge remote-tracking branch 'telmich/master' 2011-10-07 16:24:53 +02:00
Nico Schottelius
2c9beb9506 use list not method 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:23:33 +02:00
Nico Schottelius
95c5ecf789 Merge remote-tracking branch 'steven/master' 2011-10-07 16:21:08 +02:00
Nico Schottelius
ea402fc0c5 use new call to object lists in absolute path 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:18:38 +02:00
Nico Schottelius
a25ef7f0e8 fix emulator and cdist module 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:16:45 +02:00
Nico Schottelius
03f5e1b456 fix emulator and cdist module 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:15:48 +02:00
Nico Schottelius
149a605b16 use more path, move type -> cdist_type 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:14:29 +02:00
Nico Schottelius
2aa0a316e6 use _path not _dir in emulator 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:13:00 +02:00
Nico Schottelius
14c9317f66 remove old type.path 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:12:15 +02:00
Steven Armstrong
79d0a18bb2 use absolute path for accessing file system 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 16:12:01 +02:00
Nico Schottelius
c93e0f90c9 create remote conf path on new context 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:09:10 +02:00
Thomas Reifenberger
9045b30136 fix multiple requirements 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:07:02 +02:00
Nico Schottelius
3fcbabc5e8 ++fixes 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:04:37 +02:00
Steven Armstrong
600e7fb5b5 --typo 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 16:03:37 +02:00
Steven Armstrong
a7a086e29b only one instance of each named type 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 16:01:02 +02:00
Nico Schottelius
e5e2fb866c ++fixes 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 16:00:32 +02:00
Nico Schottelius
c1e7731992 cleanups/fixes 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 15:49:25 +02:00
Steven Armstrong
b505eb1af8 Merge remote-tracking branch 'telmich/master' 2011-10-07 15:42:19 +02:00
Steven Armstrong
be8428e592 relative paths 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 15:42:04 +02:00
Nico Schottelius
f8853467f3 do not create base directory in transfer_object_parameter, somebody else should have done this 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 15:39:51 +02:00
Nico Schottelius
79234148aa transfer_object_parameter: new src/dst 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 15:39:29 +02:00
Nico Schottelius
32f1e2efb6 Merge remote-tracking branch 'steven/master' 2011-10-07 15:37:10 +02:00
Nico Schottelius
183bbf61d4 fix imports from path in config_install 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 15:34:47 +02:00
Nico Schottelius
4f76cfc84e changes for relative 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 15:20:38 +02:00
Steven Armstrong
dd29e86b81 -syntax error 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 15:19:03 +02:00
Steven Armstrong
ffb33189c7 fix path/absolute_path handling 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 15:18:25 +02:00
Steven Armstrong
c56d17d674 relative paths 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 15:07:57 +02:00
Nico Schottelius
7169d6ac42 more s/_dir/_path/g 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 15:05:52 +02:00
Nico Schottelius
e1f0d60e8b restructure to _path and do not make context dependent on env 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 15:03:26 +02:00
Steven Armstrong
aafdd62698 Merge remote-tracking branch 'telmich/master' 2011-10-07 13:53:08 +02:00
Steven Armstrong
1992c9a175 --legacy code 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 13:52:55 +02:00
Nico Schottelius
fa1a4263e0 setup __cdist_base_dir 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:51:00 +02:00
Nico Schottelius
1b484e2d87 setup __cdist_base_dir 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:50:37 +02:00
Steven Armstrong
f39418a7b5 implement remote_code_remote :-( 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 13:50:17 +02:00
Nico Schottelius
ed347ffb8a fix init_deploy() 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:49:14 +02:00
Nico Schottelius
fc6ae54889 os.path not os 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:48:10 +02:00
Nico Schottelius
e03ebcd5c1 require conf_dir to find manifest_dir to find manifest 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:46:30 +02:00
Nico Schottelius
2b0a337584 fix base_dir passing 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:45:19 +02:00
Nico Schottelius
1138d8b439 remote_remote_code_remote_remote 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:44:07 +02:00
Nico Schottelius
ca5361afc1 remote cdist.path, use base_dir 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:36:51 +02:00
Nico Schottelius
f121934769 cleanup object_run() finally 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:34:22 +02:00
Steven Armstrong
4db02516e7 consistent naming 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 13:16:14 +02:00
Steven Armstrong
d9f86e26d9 consistent naming 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 13:15:52 +02:00
Steven Armstrong
6e011dc289 implement explorer_out_dir 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 13:15:11 +02:00
Nico Schottelius
484b947eca Merge remote-tracking branch 'steven/master' 2011-10-07 13:14:58 +02:00
Nico Schottelius
af5a99dc9f update object_run() for new interface 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 13:14:47 +02:00
Steven Armstrong
3ef9798098 implement code, code_remote 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 13:06:56 +02:00
Nico Schottelius
e89ca8cfc2 Merge remote-tracking branch 'steven/master' 2011-10-07 13:04:30 +02:00
Steven Armstrong
4f33e5222d Type: implement gencode, gencode_remote 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 13:04:00 +02:00
Steven Armstrong
cdccd9c0af Merge remote-tracking branch 'telmich/master' 2011-10-07 12:59:40 +02:00
Steven Armstrong
34f2999e14 Type: implement manifest_path 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 12:59:29 +02:00
Nico Schottelius
00550edfcb finish run_manifest() 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 12:58:35 +02:00
Nico Schottelius
4a98b9af55 finish run_type_manifest 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 12:56:36 +02:00
Steven Armstrong
1668620b5b Merge remote-tracking branch 'telmich/master' 
Conflicts:
	doc/dev/todo/steven

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 12:52:07 +02:00
Steven Armstrong
9473a3a19e Type: implement explorer_dir, remote_explorer_dir 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 12:49:30 +02:00
Nico Schottelius
480c1bbb35 cleanup run_type_explorer() 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 12:43:17 +02:00
Steven Armstrong
3012afeb31 Merge remote-tracking branch 'telmich/master' 2011-10-07 12:32:48 +02:00
Nico Schottelius
b936fea3e5 link to emulator in config_install and remove it from emulator 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 12:10:57 +02:00
Nico Schottelius
8a4b8e9b66 cleanup run_global_explorers() 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 12:04:38 +02:00
Nico Schottelius
b568a5886c retrieve explorers from explorer class and allow zero explorers 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 11:56:16 +02:00
Steven Armstrong
feeb7159e8 Merge remote-tracking branch 'telmich/master' 2011-10-07 11:55:12 +02:00
Nico Schottelius
73fa0e1ab7 path becomes context (+1 happy developer) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 11:51:21 +02:00
Nico Schottelius
9540d529d6 also allow to overwrite remote_base_dir 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:53:24 +02:00
Nico Schottelius
4b306e45f9 more ideas for globalexplorer 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:53:09 +02:00
Nico Schottelius
359e5156e2 +globalexplorer start 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:52:37 +02:00
Nico Schottelius
886c1d32ac DOT_CDIST -> cdist 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:48:43 +02:00
Nico Schottelius
08975c4d2f path -> config_install 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:47:29 +02:00
Nico Schottelius
0b63919cdd path -> copy 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:46:48 +02:00
Nico Schottelius
06f438f824 move stuff from path to object, remove if already existent 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:46:06 +02:00
Nico Schottelius
ee69971465 make temp_dir unecessary / only implementation detail 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:38:52 +02:00
Nico Schottelius
e26f612012 move file_to_list to cdist 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:29:22 +02:00
Nico Schottelius
cf97fd9837 remove type_explorer information from path 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:27:46 +02:00
Nico Schottelius
1810462989 move stuff over from path to object to be fixed 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:05:42 +02:00
Nico Schottelius
2b1c4df8d9 have explorers been transferred? (type) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-07 09:01:47 +02:00
Steven Armstrong
7bbecb2586 implement descriptor protocol for FileList and DirectoryDict 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 00:48:06 +02:00
Steven Armstrong
3873aefcf5 cleanup, add sort method 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-07 00:46:59 +02:00
Nico Schottelius
4beeecd48e Merge remote-tracking branch 'steven/oo-restructure' 2011-10-06 23:13:00 +02:00
Steven Armstrong
b4fc05ba09 Merge remote-tracking branch 'telmich/master' into oo-restructure 2011-10-06 22:32:03 +02:00
Nico Schottelius
6f58b18c8c remove legacy code, fail until type supports us 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:52:34 +02:00
Nico Schottelius
35a7757e1a rewrite path to include calls to non-existent methods in type (fix needed, sar :-) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:51:31 +02:00
Nico Schottelius
b891818b9c remove obsolete get_type_from_object() and use Object.type 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:42:31 +02:00
Nico Schottelius
c0d6d4d530 use name, not object 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:37:55 +02:00
Nico Schottelius
354e15015a use full.path.to.cdist.core.Type(), Steven ;-) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:34:36 +02:00
Nico Schottelius
6bd6443721 fix out dir for object 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:32:59 +02:00
Nico Schottelius
9b5b94577f add debug 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:32:47 +02:00
Nico Schottelius
be1d4afd58 add log to object 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:27:07 +02:00
Nico Schottelius
579bd45c87 cleanup more stuff in config_install 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:24:40 +02:00
Nico Schottelius
13d47f3cf4 remove datetime from config to wrong position 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:20:35 +02:00
Nico Schottelius
609efcbfd1 Remove datetime from config_install, break code and make it more beautiful 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:14:34 +02:00
Nico Schottelius
1db4cd48d2 -typo 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:11:23 +02:00
Nico Schottelius
14082f5c00 string, not tuple in exception 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 20:05:24 +02:00
Nico Schottelius
a87e6f22b5 use new cdist.Error exception 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 19:59:07 +02:00
Nico Schottelius
d07a191867 add logger to config 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 19:54:41 +02:00
Nico Schottelius
ae9eba80a9 use require, not __require in emulator 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 19:50:45 +02:00
Nico Schottelius
ccb2ffcae6 remove toplevel object/type 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 19:47:55 +02:00
Nico Schottelius
8305f07aab stage prepare uses new object interface 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 19:43:07 +02:00
Nico Schottelius
344bfb0603 was the object prepared/ran? 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 19:40:19 +02:00
Nico Schottelius
5c9694215c setup '__cdist_out_dir' in path for use in Object 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 19:26:58 +02:00
Nico Schottelius
2157cef2a6 make cdist.MissingEnvironmentVariableError print the key and not fail :-) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 19:22:08 +02:00
Nico Schottelius
df5de24b72 begin use of cdist.core.Object.list_objects() 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 18:26:55 +02:00
Steven Armstrong
c0854ebb2e remove unused constant 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 17:47:08 +02:00
Nico Schottelius
bfba1938ca Merge remote-tracking branch 'steven/oo-restructure' 2011-10-06 17:37:14 +02:00
Steven Armstrong
3a1cea6887 file system backed properties 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 17:16:12 +02:00
Steven Armstrong
12dc0d2bdd cleanup and file system backed properties 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 17:15:45 +02:00
Nico Schottelius
1da7436fcb Merge branch 'install' 
Conflicts:
	lib/cdist/config.py

Some problems left.

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 17:06:56 +02:00
Nico Schottelius
60b5f8783c revert changes from upcoming install branch 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 17:02:37 +02:00
Nico Schottelius
50edf2863a Merge remote-tracking branch 'steven/oo-restructure' 2011-10-06 17:00:52 +02:00
Nico Schottelius
220611604b +: 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 17:00:09 +02:00
Nico Schottelius
efe8dbfa85 Merge remote-tracking branch 'steven/oo-restructure' 
Conflicts:
	lib/cdist/config.py
	lib/cdist/path.py

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 16:57:48 +02:00
Nico Schottelius
1c8a143397 commit previously missed change 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 16:52:56 +02:00
Nico Schottelius
54fb9e6c3f Merge branch 'master' into install 
Conflicts:
	lib/cdist/config.py
	lib/cdist/path.py

Merged changes from config.py to config_install.py

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 16:52:20 +02:00
Nico Schottelius
8b561fd63c fixup correct split/insert of os.environ() for target_host and args 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 16:30:06 +02:00
Nico Schottelius
26278b1e32 expose target host from config 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 16:28:21 +02:00
Nico Schottelius
919f67184a do not reference scp anymore 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 15:49:08 +02:00
Nico Schottelius
5a7e4b2f32 quiet ssh/scp 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 15:48:44 +02:00
Steven Armstrong
0d9906b0b8 --typo, missing colon 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 15:18:06 +02:00
Nico Schottelius
59bee14101 begin to eliminate remote_user/prefix from path 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 14:02:37 +02:00
Nico Schottelius
df630e1fdf user remote_prefix=True now 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 13:40:46 +02:00
Nico Schottelius
eea6a38f33 cat only locally :-) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 13:39:08 +02:00
Nico Schottelius
278c379e07 use os.environ['__remote_exec'] in exec* 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 13:37:12 +02:00
Nico Schottelius
ecc4fc10d7 setup __remote_exec and __remote_copy variables 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 13:34:45 +02:00
Steven Armstrong
a15972f20d +docstring 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 13:21:48 +02:00
Steven Armstrong
41ab7390db use constant instead of string for .cdist 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 13:02:08 +02:00
Steven Armstrong
4de5f6f58e move Type into its own file 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 13:00:17 +02:00
Steven Armstrong
080ca10e19 new package cdist.core 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 12:58:08 +02:00
Steven Armstrong
cdba503ff2 move Object class into its own file 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 12:57:38 +02:00
Steven Armstrong
a4abb53ced +MissingEnvironmentVariableError 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-06 12:52:13 +02:00
Nico Schottelius
2ec2ab26ce update path with changes from yesterday (system crash) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 12:34:34 +02:00
Nico Schottelius
820eea56fb install finish 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-06 09:27:16 +02:00
Steven Armstrong
82f548bafd Merge remote-tracking branch 'telmich/install' into oo-restructure 2011-10-05 17:06:56 +02:00
Nico Schottelius
f84cabffe3 cleanup path 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-05 16:49:20 +02:00
Steven Armstrong
94d926c0d6 Merge remote-tracking branch 'telmich/install' into oo-restructure 2011-10-05 16:48:15 +02:00
Steven Armstrong
8e06626c5a Merge remote-tracking branch 'telmich/install' into oo-restructure 2011-10-05 16:47:49 +02:00
Nico Schottelius
7f85aab3ef add some pseudo code to adapt to changes 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-05 16:45:10 +02:00
Steven Armstrong
2e61e8b202 finish object class 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-05 16:44:22 +02:00
Nico Schottelius
a0c984acdd config+install is broken now due to refactoring 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-05 16:38:19 +02:00
Nico Schottelius
68889c4bf7 finish type, shrink path 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-05 16:12:25 +02:00
Steven Armstrong
099adec61f start working on object class 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2011-10-05 16:08:29 +02:00
Nico Schottelius
2176e4e2d4 begin new type type (no typo) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-05 16:05:11 +02:00
Nico Schottelius
28428177ae --typo 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-05 15:53:34 +02:00
Nico Schottelius
9128cc28c4 introduce a lot todo in path 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-05 15:50:17 +02:00
Nico Schottelius
a875d69d7e continue on test_path testcase 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-05 14:15:05 +02:00
Nico Schottelius
b3f914f6f6 create base module for install and config 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 18:45:29 +02:00
Nico Schottelius
f88cb78d61 finish test_path.test_type_detection 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 18:36:43 +02:00
Nico Schottelius
8dd248cf76 cleanup on exit and begin to create test types 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 17:01:11 +02:00
Nico Schottelius
6c22867fc2 begin to test path and add method to check type 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 16:32:43 +02:00
Nico Schottelius
40a1619c1a make build test work (or fail, but work) again 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 16:15:10 +02:00
Nico Schottelius
3d75ec9bfc make test suite usable from command line 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 15:49:18 +02:00
Nico Schottelius
410a2fe7ff test_explorer_ran finished 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 15:08:37 +02:00
Nico Schottelius
13ed37a4e9 begin to test explorer success in test_install 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 14:45:35 +02:00
Nico Schottelius
db322c0b5e integrate tests into library 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-10-04 14:29:33 +02:00
Nico Schottelius
26c0d5d9aa upcoming changes for 2.0.3 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 17:27:28 +02:00
Nico Schottelius
d15d659248 increment version for next release 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 17:20:43 +02:00
Nico Schottelius
d8da7635de use warning loglevel by default 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 17:15:54 +02:00
Nico Schottelius
b52939ccfe only debug if __debug is setup 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 16:40:50 +02:00
Nico Schottelius
ae7887f775 ++changes 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 16:25:58 +02:00
Nico Schottelius
a165585699 pass __debug to manifest 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 16:20:46 +02:00
Nico Schottelius
272b8722c1 fix output, compare string with string not string with list 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 16:10:53 +02:00
Nico Schottelius
ccbd0f1d84 introduce config.link_emulator() to be called from test 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 16:05:26 +02:00
Nico Schottelius
cc87573d6b remove lecagy cdist-type-emulator support 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 15:35:04 +02:00
Nico Schottelius
0913bb21dd use raise instead of sys.exit in emulator 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 14:08:11 +02:00
Nico Schottelius
9d582ae24f rename emulator to run 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 14:01:09 +02:00
Nico Schottelius
6f1a13b531 move emulator link to emulator module and make source variable (exec_path) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 13:38:25 +02:00
Nico Schottelius
2c0a7adf74 replace CdistError with cdist.Error 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 00:49:12 +02:00
Nico Schottelius
df84480fcc BUGFIX: emulator compared parameter with value 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-27 00:02:04 +02:00
Nico Schottelius
c687dbdc70 remove remote_cat, as it's only used in exec module 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 16:22:09 +02:00
Nico Schottelius
6e73572a95 easier check for remote_prefix 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 16:21:56 +02:00
Nico Schottelius
7882b4a3ac only print env, if existent 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 16:03:53 +02:00
Nico Schottelius
4906f604f0 raise cdist errors 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 15:42:39 +02:00
Nico Schottelius
fc1e0d9f1f remove exec bits from copying 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 11:55:59 +02:00
Nico Schottelius
27b4b9cd03 also move out install and cleanup library path code 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 11:53:09 +02:00
Nico Schottelius
35e33570d1 also move out config 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 11:45:19 +02:00
Nico Schottelius
0197f8da13 more cleanups from refactoring 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 11:25:22 +02:00
Nico Schottelius
74dc5b96cb type emulator begins to run 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 11:21:04 +02:00
Nico Schottelius
6d75016139 make type emulator load again 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 11:18:36 +02:00
Nico Schottelius
3f6c479d72 move TYPE_PREFIX back into main, as it's only needed there and should work without module 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 11:07:45 +02:00
Nico Schottelius
16d58dcac7 move out banner, fail at emulator 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 11:05:18 +02:00
Nico Schottelius
e6a903fd96 cleanup logger stuff, remove more path stuff from cdist bin 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 10:28:57 +02:00
Nico Schottelius
8f2e5bb8c8 cleanup and move error class to init 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 10:25:51 +02:00
Nico Schottelius
bc9bc37aab use remote_prefix internally 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-26 10:17:02 +02:00
Nico Schottelius
8af45f83b2 rearange remote_user 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-23 20:53:09 +02:00
Nico Schottelius
3925ba1c6e pass remote_prefix to run_or_fail/shell 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-23 20:35:13 +02:00
Nico Schottelius
e14848ec1f remove run* from cdist and put it into lib/exec 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-23 20:21:10 +02:00
Nico Schottelius
79173488ff cdist runs with path module loaded (unusued though) 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-23 20:08:55 +02:00
Nico Schottelius
26fad6f23c correct base dir, now relative to lib 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-23 19:13:36 +02:00
Nico Schottelius
6139fab354 import cdist.path works 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-23 19:10:07 +02:00
Nico Schottelius
8e59f97800 begin to used cdist.path 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
 2011-09-23 18:55:23 +02:00