From 2aa9f2ab8c8cb4d1349ea6ce98a9e3df8e5b0851 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 23 Sep 2011 18:56:29 +0200 Subject: [PATCH 1/6] test: things to do Signed-off-by: Nico Schottelius --- doc/dev/todo/TAKEME | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME index 5439a1b9..8be1da54 100644 --- a/doc/dev/todo/TAKEME +++ b/doc/dev/todo/TAKEME @@ -9,6 +9,12 @@ CORE - allow cdist to run without $PATH setup: ./bin/cdist-deploy-to - support non-ssh access? +TESTS +----- +- multiple defines of object: + - fail if different parameters + - succeed if same parameters + USER INTERFACE -------------- - add support $__tmp? From 7b39169e3e55231eef729d83eea32be97ff49841 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 25 Sep 2011 15:25:38 +0200 Subject: [PATCH 2/6] ignore all python cache dirs Signed-off-by: Nico Schottelius --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d606aec7..fb9c495c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,5 @@ doc/man/man*/docbook-xsl.css # Ignore cache for version control cache/ -# Python -bin/__pycache__/ +# Python / cache +__pycache__/ From a5bfd4119521b6758b7893945812ae2be2ad70dd Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 25 Sep 2011 15:26:54 +0200 Subject: [PATCH 3/6] Detect owl Signed-off-by: Nico Schottelius --- conf/explorer/os | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/explorer/os b/conf/explorer/os index e922c067..268dae24 100755 --- a/conf/explorer/os +++ b/conf/explorer/os @@ -65,6 +65,11 @@ if [ -f /etc/SuSE-release ]; then exit 0 fi +if uname -r | grep -s '.owl' >/dev/null 2>&1; then + echo owl + exit 0 +fi + if [ -f /etc/cdist-preos ]; then echo preos exit 0 From c10fedaf8c9f87c36e0a0bb2602de8a6ff46edec Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 25 Sep 2011 21:10:18 +0200 Subject: [PATCH 4/6] it's not preos, but cdist-preos Signed-off-by: Nico Schottelius --- conf/explorer/os | 2 +- doc/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/explorer/os b/conf/explorer/os index 268dae24..3e1582ec 100755 --- a/conf/explorer/os +++ b/conf/explorer/os @@ -71,7 +71,7 @@ if uname -r | grep -s '.owl' >/dev/null 2>&1; then fi if [ -f /etc/cdist-preos ]; then - echo preos + echo cdist-preos exit 0 fi diff --git a/doc/changelog b/doc/changelog index b1149eb1..a08efb34 100644 --- a/doc/changelog +++ b/doc/changelog @@ -1,3 +1,6 @@ +2.0.2: + * Add support for detection of OpenWall Linux (Matthias Teege) + 2.0.1: 2011-09-23 * Bugfix core: Always print source of error in case of exec errors * Bugfix core: Various smaller bugs in string concatenation From 98f4ec9f3e6334768e3f7065dfd66ef9e13c772c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 26 Sep 2011 09:24:49 +0200 Subject: [PATCH 5/6] document asciidoc requirement Signed-off-by: Nico Schottelius --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 5e60a093..b8181757 100644 --- a/README +++ b/README @@ -78,6 +78,7 @@ cdist was tested or is know to run on at least * A posix like shell * Python (>= 3.2 required) * SSH-Client + * Asciidoc (for building the manpages) ### Client ("target host") From fd9fb13606aa54687d36f9b70965cb6a9e086829 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 26 Sep 2011 09:26:58 +0200 Subject: [PATCH 6/6] and remove asciidoc/gmake dep from the comment Signed-off-by: Nico Schottelius --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index b8181757..daa12f70 100644 --- a/README +++ b/README @@ -99,7 +99,7 @@ To install cdist, execute the following commands: cd cdist export PATH=$PATH:$(pwd -P)/bin - # If you want the manpages (requires gmake and asciidoc to be installed) + # If you want the manpages ./build.sh man export MANPATH=$MANPATH:$(pwd -P)/doc/man