From f64c7988de1ecdc1af61be97bc74a47b04e09e88 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Tue, 29 Mar 2011 16:52:27 +0200 Subject: [PATCH 1/7] document __self Signed-off-by: Steven Armstrong --- doc/man/cdist-reference.text.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh index f6840880..48954b8e 100755 --- a/doc/man/cdist-reference.text.sh +++ b/doc/man/cdist-reference.text.sh @@ -166,6 +166,9 @@ __object:: __object_id:: The type unique object id. Available for: type manifest, type explorer, type codegen +__self:: + The full qualified name of the current object. + Available for: type manifest, type explorer, type codegen __target_host:: The host we are deploying to. Available for: initial manifest, type manifest, type codegen From a891a951e71736136de2c88855ff0252b11d7fed Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:49:05 +0200 Subject: [PATCH 2/7] cleanup todos Signed-off-by: Nico Schottelius --- doc/dev/todo/TAKEME | 11 +++++++++++ doc/dev/todo/niconext | 12 +----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME index a591038c..7e6a44d9 100644 --- a/doc/dev/todo/TAKEME +++ b/doc/dev/todo/TAKEME @@ -21,3 +21,14 @@ DOCUMENTATION -------------- - asciidoc interprets __, which we use for variables names -> seek through docs and replace with \_\_! +- check all all internal variables are prefixed with __cdist + +Cache: + - add example how to use + - export variable $__cache + -> for current host + -> add function to cdist-config, import from cdist-cache + + +remove --preseed from package_apt and add debconf_set_selection or similar + -> much cleaner! diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext index be66a33d..29229d64 100644 --- a/doc/dev/todo/niconext +++ b/doc/dev/todo/niconext @@ -1,11 +1 @@ -/ prefix all internal variables with __cdist! -> Nico - -Cache: - - add example how to use - - export variable $__cache - -> for current host - -> add function to cdist-config, import from cdist-cache - - -remove --preseed from package_apt and add debconf_set_selection or similar - -> much cleaner! +Release 1.5.0 correctly :-) From 1ca8aec2066a19e1ec58e59a80a84420f56e81bb Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:49:49 +0200 Subject: [PATCH 3/7] update web/readme Signed-off-by: Nico Schottelius --- README | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README b/README index a62ac61c..3a4b2051 100644 --- a/README +++ b/README @@ -144,7 +144,8 @@ may vanish at any point. To select a specific branch use git checkout -b origin/ # Stay on a specific version - git checkout -b 1.4 origin/1.4 + version=1.5 + git checkout -b $version origin/$version ### Mirrors From dde2f370546e03a1e2a85b11162c20aadd80b87f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:51:11 +0200 Subject: [PATCH 4/7] make build.sh die on error Signed-off-by: Nico Schottelius --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index 335bbe9c..52b3466e 100755 --- a/build.sh +++ b/build.sh @@ -23,6 +23,9 @@ # Pull a directory from a target, both sides have the same name (i.e. explorers) # +# exit on any error +set -e + # Manpage and HTML A2XM="a2x -f manpage --no-xmllint" A2XH="a2x -f xhtml --no-xmllint" From 9a56c5122c86649e6665516c77d82f7668523378 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:52:53 +0200 Subject: [PATCH 5/7] +release target in build.sh Signed-off-by: Nico Schottelius --- build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.sh b/build.sh index 52b3466e..1d02256f 100755 --- a/build.sh +++ b/build.sh @@ -99,6 +99,10 @@ case "$1" in ${MANDIR}/cdist-reference.text.sh ;; + release) + "$0" clean && "$0" man && "$0" web + ;; + web) cp README ${WEBDIR}/${WEBPAGE} rm -rf ${WEBDIR}/${WEBBASE}/man && mkdir ${WEBDIR}/${WEBBASE}/man From bcbabe885b6c8ecfbe0cc346ece8034e658a2374 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:54:11 +0200 Subject: [PATCH 6/7] authors on one line Signed-off-by: Nico Schottelius --- doc/man/cdist-stages.text | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/man/cdist-stages.text b/doc/man/cdist-stages.text index 6ac6efe2..cbd541fe 100644 --- a/doc/man/cdist-stages.text +++ b/doc/man/cdist-stages.text @@ -1,7 +1,6 @@ cdist-stages(7) =============== -Nico Schottelius -Steven Armstrong +Nico Schottelius , Steven Armstrong NAME From 022e255d7a0bb497e19cf9f5c48e723c3a0e4f6b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 29 Mar 2011 16:55:40 +0200 Subject: [PATCH 7/7] less line breaks in asciidoc Signed-off-by: Nico Schottelius --- doc/man/cdist-object-code-run.text | 3 +-- doc/man/cdist-object-explorer-run.text | 3 +-- doc/man/cdist-object-gencode-run.text | 3 +-- doc/man/cdist-object-push.text | 3 +-- doc/man/cdist-object-run-all.text | 3 +-- doc/man/cdist-object-run.text | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/doc/man/cdist-object-code-run.text b/doc/man/cdist-object-code-run.text index 4d19b5eb..c662d4c3 100644 --- a/doc/man/cdist-object-code-run.text +++ b/doc/man/cdist-object-code-run.text @@ -1,7 +1,6 @@ cdist-object-code-run(1) ======================== -Nico Schottelius -Steven Armstrong +Nico Schottelius , Steven Armstrong NAME diff --git a/doc/man/cdist-object-explorer-run.text b/doc/man/cdist-object-explorer-run.text index a94047c3..a1c87cd6 100644 --- a/doc/man/cdist-object-explorer-run.text +++ b/doc/man/cdist-object-explorer-run.text @@ -1,7 +1,6 @@ cdist-object-explorer-run(1) ============================ -Nico Schottelius -Steven Armstrong +Nico Schottelius , Steven Armstrong NAME diff --git a/doc/man/cdist-object-gencode-run.text b/doc/man/cdist-object-gencode-run.text index d69d1787..fc93ebfd 100644 --- a/doc/man/cdist-object-gencode-run.text +++ b/doc/man/cdist-object-gencode-run.text @@ -1,7 +1,6 @@ cdist-object-gencode-run(1) =========================== -Nico Schottelius -Steven Armstrong +Nico Schottelius , Steven Armstrong NAME diff --git a/doc/man/cdist-object-push.text b/doc/man/cdist-object-push.text index 69648a4d..168f5190 100644 --- a/doc/man/cdist-object-push.text +++ b/doc/man/cdist-object-push.text @@ -1,7 +1,6 @@ cdist-object-push(1) ==================== -Nico Schottelius -Steven Armstrong +Nico Schottelius , Steven Armstrong NAME diff --git a/doc/man/cdist-object-run-all.text b/doc/man/cdist-object-run-all.text index a3a8d56b..2b27347c 100644 --- a/doc/man/cdist-object-run-all.text +++ b/doc/man/cdist-object-run-all.text @@ -1,7 +1,6 @@ cdist-object-run-all(1) ======================= -Nico Schottelius -Steven Armstrong +Nico Schottelius , Steven Armstrong NAME diff --git a/doc/man/cdist-object-run.text b/doc/man/cdist-object-run.text index b527c0e6..b91e50ca 100644 --- a/doc/man/cdist-object-run.text +++ b/doc/man/cdist-object-run.text @@ -1,7 +1,6 @@ cdist-object-run(1) =================== -Nico Schottelius -Steven Armstrong +Nico Schottelius , Steven Armstrong NAME