Commit graph

528 commits

Author SHA1 Message Date
Nico Schottelius
4d4287c580 Merge remote-tracking branch 'steven/master' 2011-10-18 15:14:44 +02:00
Steven Armstrong
04af96b5e3 Merge remote-tracking branch 'telmich/master' 2011-10-18 15:09:50 +02:00
Steven Armstrong
d427e3f585 __self should not contain .cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
205cd7b28a fix the test
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
2246b7496b fails if requirement has illegal object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
2a5465c03c test that emulator fails if requirement has illegal object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
030d5919e6 raise exception if object_id contains .cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
af367a76f8 test for: .cdist may not be used in object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
e58b52592b add missing environment variable __self
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
1805c16fd4 --debug
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
a946b5cf59 verify manifest environment
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Nico Schottelius
7bb81e2f18 Whitespace does not not weigh anything - remove - sed -i 's/ *$//g' *py */*py
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-10-18 13:32:36 +02:00
Nico Schottelius
7160637014 remove trailing whitespace: :%s/ *$//g
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-10-18 13:29:44 +02:00
Steven Armstrong
91c1215566 wrap exceptions in cdist.Error
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 13:27:44 +02:00
Steven Armstrong
e9a0aa1863 fail if requirements type does not exist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 13:20:14 +02:00
Steven Armstrong
64edfc4640 add tests for emulator
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 13:19:37 +02:00
Steven Armstrong
4975b4643a --typo
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 13:11:53 +02:00
Steven Armstrong
95a858c350 implement: fail if type does not exist on the filesystem
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 12:46:06 +02:00
Steven Armstrong
a0a4a7382d import NoSuchTypeError into cdist.core namespace
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 12:44:07 +02:00
Steven Armstrong
bd81045caf test for nonexistent type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 12:43:14 +02:00
Nico Schottelius
50cb8807bf fix tests to work (not code :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-18 09:57:50 +02:00
Nico Schottelius
03ea7787d2 +self
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-16 18:38:22 +02:00
Nico Schottelius
420b6aeae7 ensure object is not ran twice
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-16 15:08:00 +02:00
Nico Schottelius
32b2c49d32 found 2 bugs in transfer_code_remote
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-16 12:39:06 +02:00
Nico Schottelius
3883fe4247 raise cdist error instead of oserror
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-16 00:12:32 +02:00
Nico Schottelius
3c31b4f9a3 and finally also adjust the requirement itself
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 23:40:11 +02:00
Nico Schottelius
950424d478 move log output into correct function, also log object code run/gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 23:29:27 +02:00
Nico Schottelius
42e1c21f43 print progress output in info level for object prepare
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 23:26:54 +02:00
Nico Schottelius
5a72223ae3 strip away / in emulator in requirements
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 23:23:57 +02:00
Nico Schottelius
053903bb69 use instance logger in explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 12:00:46 +02:00
Steven Armstrong
b8b9719cc6 Merge remote-tracking branch 'telmich/master'
Conflicts:
	lib/cdist/core/explorer.py
	lib/cdist/emulator.py

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-15 10:51:08 +02:00
Nico Schottelius
ee1c568c7b almost finish correct requirement loading, but need sleep
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 02:54:54 +02:00
Nico Schottelius
0dd38f75c2 remove leading / from object_id of requirement
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 02:46:28 +02:00
Nico Schottelius
a7a3ee6f19 adjust prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 02:36:33 +02:00
Nico Schottelius
e002710c4c rewrite emulator to class based approach for better logging
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 02:31:40 +02:00
Nico Schottelius
00a1f1eeb9 ++ more host prefixing log code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 01:41:11 +02:00
Nico Schottelius
a415cc4b91 add correct logger in manifest
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 01:38:22 +02:00
Nico Schottelius
67b1094712 flatten error message in remotescripterror as well
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 01:25:57 +02:00
Nico Schottelius
ad1e51cb2e catch unicodedecodeerror
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 01:11:54 +02:00
Steven Armstrong
889e6c23cb Explorer tracks which type explorers have been transferred instad of Type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-15 00:44:54 +02:00
Steven Armstrong
d83de25774 Stripp leading slash from requirements object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-15 00:26:00 +02:00
Nico Schottelius
db6fdeebfe log.info for global explorers (may also take some time)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 00:14:25 +02:00
Nico Schottelius
0d441eb378 report info when running initial manifest (it may take some time)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 00:12:08 +02:00
Nico Schottelius
3f76f03239 return full command only in local mode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 00:10:35 +02:00
Nico Schottelius
ef1ebbd0b7 remove senseless message superseeded by new logging prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-14 23:56:33 +02:00
Steven Armstrong
fb2a3cb06e Merge remote-tracking branch 'telmich/master' 2011-10-14 23:52:51 +02:00
Steven Armstrong
b5b7d8e727 add missing return_output=True argument when fetching script content
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-14 23:52:05 +02:00
Nico Schottelius
9223663136 CLEANUP: return flat name, not python list to user
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-14 23:51:01 +02:00
Nico Schottelius
1e31721ad9 BUGFIX: remote path for explorer in __object variable
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-14 23:50:31 +02:00
Steven Armstrong
325a13088c implement that type explorers are only transfered once
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-14 23:47:05 +02:00