Commit graph

568 commits

Author SHA1 Message Date
Nico Schottelius
da1d3fbc04 begin new error catching code and make filter a function
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:51:24 +02:00
Nico Schottelius
231eb1214c refuse to try to recreate a type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:33:48 +02:00
Nico Schottelius
10ebdd87d4 fixes + local and remote gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:31:15 +02:00
Nico Schottelius
0e42e98bb9 begin to cleanup bin/cdist-type-template
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:27:01 +02:00
Nico Schottelius
10cc25330c remove space at the end of the line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-08 10:57:18 +02:00
Nico Schottelius
4873b046ba allow user to change __cdist_tmp_base_dir to avoid using /tmp
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-08 10:52:03 +02:00
Nico Schottelius
c3341df08d Upgrade to 1.6.1
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-07 09:56:59 +02:00
Nico Schottelius
b0391ac0c9 BUGFIX: do not fail, if cache/ is missing
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 22:09:04 +02:00
Nico Schottelius
0a3a434269 remove ... dots ... make ... me ...feel ... weired
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:51:43 +02:00
Nico Schottelius
bc1c7f104e core prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:50:49 +02:00
Nico Schottelius
31164be1d0 remove full path to manifest in logging (will be presented on error anyway)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:44:41 +02:00
Nico Schottelius
e7ad5987e4 + self variable
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:43:32 +02:00
Nico Schottelius
315de6fe15 log improvements
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:41:40 +02:00
Nico Schottelius
b86d3ba26a remove ugly OBJECT messages
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:38:41 +02:00
Nico Schottelius
c0a83f9d85 ++__cdist_exit_err
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:22:44 +02:00
Nico Schottelius
49e8efdaf5 object self, not object
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:20:58 +02:00
Nico Schottelius
bb96163315 blame on the right file
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:19:47 +02:00
Nico Schottelius
05c8634f8b correctly use __cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:19:21 +02:00
Nico Schottelius
fb0dafba5c make faulty code a warning
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:18:15 +02:00
Nico Schottelius
838d43d74c do not fail if code is missing, but inform
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:17:11 +02:00
Nico Schottelius
35d4760c13 ++__cdist_echo ++todo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:15:11 +02:00
Nico Schottelius
4a7c6c2738 ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:12:00 +02:00
Nico Schottelius
afdecb8836 ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:10:34 +02:00
Nico Schottelius
0580406ff2 there is no __cdist_object in this context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:08:40 +02:00
Nico Schottelius
96c4024a51 bugfix + real use of __cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:07:39 +02:00
Nico Schottelius
df58c4e5f5 echo, not info
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:03:37 +02:00
Nico Schottelius
a08bd18f4e make first real use of new __cdist_echo with __cdist_object_self setup
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:59:57 +02:00
Nico Schottelius
caed694dee ++__cdist_echo + FIXME
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:58:34 +02:00
Nico Schottelius
2162d444b3 better logging in __cdist_exec_fail_on_error
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:55:53 +02:00
Nico Schottelius
1f4e8fe564 do not create code if there is no gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:54:34 +02:00
Nico Schottelius
8924a9583d ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:52:14 +02:00
Nico Schottelius
ec513eae49 ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:51:17 +02:00
Nico Schottelius
cb5fc962b3 use __cdist prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:50:09 +02:00
Nico Schottelius
d0434ea56b 1.6.1++
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:46:40 +02:00
Nico Schottelius
d75f2d4d29 ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:38:31 +02:00
Nico Schottelius
d000de2be9 code, not gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:36:21 +02:00
Nico Schottelius
f08a9eaaa9 +: after object_self
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:35:27 +02:00
Nico Schottelius
9d5d0b8cdd always setup __cdist_echo_prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:34:46 +02:00
Nico Schottelius
290915ee64 __cdist_echo++
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:34:07 +02:00
Nico Schottelius
e3f27f1794 allow empty $__cdist_object_self
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:31:19 +02:00
Nico Schottelius
e4390da300 requiring set +e in __cdist_exec_fail_on_error to catch error ourselves
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:18:31 +02:00
Nico Schottelius
d31833a78e begin use of __cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:16:16 +02:00
Nico Schottelius
813b4e1f2b use __cdist_exec_fail_on_error in bin/cdist-code-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:11:39 +02:00
Nico Schottelius
08d18ec1ec show broken code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:05:58 +02:00
Nico Schottelius
90f5d47164 add warning level
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:04:34 +02:00
Nico Schottelius
723046fdd2 introduce and use __cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:00:36 +02:00
Nico Schottelius
4aa0d80310 prepare files for 1.6.0 release
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 19:36:57 +02:00
Nico Schottelius
1973ac0787 use wait instead of fg
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:22:44 +02:00
Nico Schottelius
75509dc8a5 PLUS whitespace (not only, but also for Steven)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:18:14 +02:00
Nico Schottelius
5aa32fa42d beautify parallel mode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:16:33 +02:00
Nico Schottelius
b9ef12b48d enhance cdist-mass-deploy and add parallel execution
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:05:47 +02:00
Nico Schottelius
32c2612934 ge vs lt
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:59:34 +02:00
Nico Schottelius
e84ab9e14c in theory finish cdist-mass-deploy
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:58:00 +02:00
Nico Schottelius
7496639e1f add template for cdist-mass-deploy
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:56:16 +02:00
Steven Armstrong
71765210bb rename cdist-object-process to cdist-object-prepare
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-04-05 22:55:46 +02:00
Nico Schottelius
c5925ff331 prepare version change
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-05 17:43:10 +02:00
Nico Schottelius
c532a2ccd3 remove one Error of Error: Error: /home/users/nico/oeffentlich/rechner/projekte/cdist-used/conf/type/__nico_desktop/manifest exited non-zero.
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 02:22:08 +02:00
Nico Schottelius
a648aa5333 fix cdist-object-all: ensure output directory exists
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 22:25:56 +02:00
Nico Schottelius
7d0877d8ce ++cleanups
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 20:29:22 +02:00
Nico Schottelius
5359ed863c +cleanups++
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 20:21:08 +02:00
Nico Schottelius
b3d7cf3192 more cleanups, __cdist prefixes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 19:35:26 +02:00
Nico Schottelius
9955dc74c6 cleanups in bin/
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 18:43:08 +02:00
Nico Schottelius
dd176d7a64 construct cache dir path in cdist-config, not cdist-cache
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 15:40:08 +02:00
Steven Armstrong
e7ff4c37ff remove legacy commented code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-31 11:08:10 +02:00
Steven Armstrong
61b7b68671 split explorer/manifest and gencode runcode into to 2 steps
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-30 22:46:49 +02:00
Steven Armstrong
e7f7a88357 prefix error messages with Error:
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 22:00:54 +02:00
Steven Armstrong
1cfdc6886f fail if a requested object is not defined
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:51:59 +02:00
Steven Armstrong
878f7d18ce move export of __cdist_out_object_dir to cdist-run-remote
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:49:06 +02:00
Steven Armstrong
fe159eccb2 prefix all variables with __cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:47:05 +02:00
Steven Armstrong
2345d6509b add missing function call to __cdist_usage
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:20:07 +02:00
Nico Schottelius
1d05756076 release 1.5.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:47:02 +02:00
Steven Armstrong
ebbacf4873 remove unused functions
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 16:41:38 +02:00
Nico Schottelius
6be9d02e6a consistency: function {} begin on next line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:28:59 +02:00
Nico Schottelius
ad7a9f82f7 __cdist_objects_created == local output
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:27:57 +02:00
Steven Armstrong
f2967ef9f1 remove legacy script
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:36:23 +02:00
Steven Armstrong
ce62775aec remove hard coded variable names; prefix all variables with __cdist_
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:29:56 +02:00
Steven Armstrong
32392d129a implement $__self
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:27:17 +02:00
Steven Armstrong
801d2be3d2 remove legacy variables
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:17:45 +02:00
Steven Armstrong
f187ed257a implement the big code shuffle
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 14:36:35 +02:00
Nico Schottelius
5306737d22 discuss todos / cleanup / make more fun for us
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 10:38:35 +02:00
Nico Schottelius
3618b225a3 make all internal variables __cdist_ prefixed
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 10:34:04 +02:00
Nico Schottelius
c80fa65af1 -blank line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:42:04 +02:00
Nico Schottelius
a46c0a4372 replace CONSTANT target host by variable target host
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:38:43 +02:00
Nico Schottelius
8315ac2e25 - blank lines
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:38:08 +02:00
Nico Schottelius
8abd5ce33e - another empty line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:37:26 +02:00
Nico Schottelius
332548ba4f more todo, less whiteline in bin/cdist-object-explorer-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:31:26 +02:00
Nico Schottelius
78777ba9f3 use same argv processing as elsewhere
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:30:09 +02:00
Nico Schottelius
10c96dee87 -useless emptly line in bin/cdist-deploy-to
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:26:17 +02:00
Nico Schottelius
4e68c3027b remove self explanatory comments
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:19:51 +02:00
Nico Schottelius
4ab770400a - lines + variable alignement
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:17:17 +02:00
Nico Schottelius
29b61f38ea remove unecessary empty lines (interrupts read flow)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:09:35 +02:00
Steven Armstrong
9381b1c233 merge current master
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 17:15:26 +02:00
Steven Armstrong
8b0b7052c6 remove commented obsolete code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 15:28:55 +02:00
Steven Armstrong
5ce4586fd3 Merge branch 'changerunningorder' into executionorder 2011-03-28 15:27:32 +02:00
Steven Armstrong
db66d3731d merge master
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 15:27:00 +02:00
Nico Schottelius
62c4f0d086 ABORT if explorer fails, not only WARN
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 15:16:48 +02:00
Nico Schottelius
02a2d39ebf Merge branch 'master' into changerunningorder
Conflicts:
	bin/cdist-deploy-to

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 15:02:12 +02:00
Steven Armstrong
4ee5d74c9f implement dependency handling at the object level
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 14:55:58 +02:00
Steven Armstrong
cd1a1347c9 merge from changerunningorder
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 13:03:17 +02:00
Steven Armstrong
1c51d32cdc add missing variable __cdist_type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 12:45:16 +02:00