From a1b9bec8ce72f1d093ce0182cd78652041c2619f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 18 Oct 2011 09:55:30 +0200 Subject: [PATCH 1/4] changes for 2.0.3 Signed-off-by: Nico Schottelius --- doc/changelog | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/changelog b/doc/changelog index bc527304..aae0e04a 100644 --- a/doc/changelog +++ b/doc/changelog @@ -1,4 +1,4 @@ -2.0.3: +2.0.3: 2011-10-18 * Improved logging, added --verbose, by more quiet by default * Bugfix __user: Correct quoting (Steven Armstrong) * Bugfix __addifnosuchline: Falsely exited @@ -6,10 +6,6 @@ * Feature requirements: Check for broken object_ids and abort * Massive refactoring and unittesting introduced (Steven Armstrong) - * Feature: Initial undocumented support for replacing - the remote exec and remote copy commands - * Feature: Initial undocumented support for installations in core - 2.0.2: 2011-09-27 * Add support for detection of OpenWall Linux (Matthias Teege) * Add support for __debug variable in manifests From 50cb8807bfaaf9bf8295b00a5edde64539396a20 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 18 Oct 2011 09:57:50 +0200 Subject: [PATCH 2/4] fix tests to work (not code :-) Signed-off-by: Nico Schottelius --- lib/cdist/test/explorer/__init__.py | 3 ++- lib/cdist/test/manifest/__init__.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/cdist/test/explorer/__init__.py b/lib/cdist/test/explorer/__init__.py index e6858812..fe23b7e2 100644 --- a/lib/cdist/test/explorer/__init__.py +++ b/lib/cdist/test/explorer/__init__.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # # 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc) +# 2011 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # @@ -62,7 +63,7 @@ class ExplorerClassTestCase(unittest.TestCase): self.explorer = explorer.Explorer(self.target_host, self.local, self.remote) - self.log = logging.getLogger("cdist") + self.log = logging.getLogger(self.target_host) def tearDown(self): shutil.rmtree(self.out_path) diff --git a/lib/cdist/test/manifest/__init__.py b/lib/cdist/test/manifest/__init__.py index 86885a59..efda5b0a 100644 --- a/lib/cdist/test/manifest/__init__.py +++ b/lib/cdist/test/manifest/__init__.py @@ -55,7 +55,7 @@ class ManifestTestCase(unittest.TestCase): self.local.create_directories() self.local.link_emulator(cdist.test.cdist_exec_path) self.manifest = manifest.Manifest(self.target_host, self.local) - self.log = logging.getLogger("cdist") + self.log = logging.getLogger(self.target_host) def tearDown(self): shutil.rmtree(self.temp_dir) From 10114dccee00299063f41966750ebc9d09b15476 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 18 Oct 2011 10:44:09 +0200 Subject: [PATCH 3/4] add traceback output, uncaught Signed-off-by: Nico Schottelius --- doc/dev/logs/2011-10-18.traceback-gencode | 28 +++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/dev/logs/2011-10-18.traceback-gencode diff --git a/doc/dev/logs/2011-10-18.traceback-gencode b/doc/dev/logs/2011-10-18.traceback-gencode new file mode 100644 index 00000000..3de967c1 --- /dev/null +++ b/doc/dev/logs/2011-10-18.traceback-gencode @@ -0,0 +1,28 @@ +[...] +INFO: sgv-sysadmin-01: Running gencode and code for __director/home/services/nfs +Traceback (most recent call last): + File "./bin/cdist", line 211, in + commandline() + File "./bin/cdist", line 110, in commandline + args.func(args) + File "./bin/cdist", line 113, in config + configinstall(args, mode=cdist.config.Config) + File "./bin/cdist", line 131, in configinstall + if not configinstall_onehost(host, args, mode, parallel=False): + File "./bin/cdist", line 177, in configinstall_onehost + c.deploy_and_cleanup() + File "/home/users/nico/oeffentlich/rechner/projekte/cdist-nutzung/lib/cdist/config_install.py", line 71, in deploy_and_cleanup + self.deploy_to() + File "/home/users/nico/oeffentlich/rechner/projekte/cdist-nutzung/lib/cdist/config_install.py", line 66, in deploy_to + self.stage_run() + File "/home/users/nico/oeffentlich/rechner/projekte/cdist-nutzung/lib/cdist/config_install.py", line 164, in stage_run + self.object_run(cdist_object) + File "/home/users/nico/oeffentlich/rechner/projekte/cdist-nutzung/lib/cdist/config_install.py", line 143, in object_run + self.object_run(required_object) + File "/home/users/nico/oeffentlich/rechner/projekte/cdist-nutzung/lib/cdist/config_install.py", line 135, in object_run + cdist_object.ran = True + File "/home/users/nico/oeffentlich/rechner/projekte/cdist-nutzung/lib/cdist/util/fsproperty.py", line 237, in __set__ + open(path, "w").close() +IOError: [Errno 2] No such file or directory: '/home/users/nico/.tmp/tmp2gau4p/out/object/__director/home/services/nfs/.cdist/ran' +[10:43] brief:cdist-nutzung% + From fc3382f976cf3eb581dcead2bea280064d29556f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 18 Oct 2011 12:24:47 +0200 Subject: [PATCH 4/4] add log for requirement for non-existent type bug Signed-off-by: Nico Schottelius --- doc/dev/logs/2011-10-18.requirement-object | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/dev/logs/2011-10-18.requirement-object diff --git a/doc/dev/logs/2011-10-18.requirement-object b/doc/dev/logs/2011-10-18.requirement-object new file mode 100644 index 00000000..7e064ef0 --- /dev/null +++ b/doc/dev/logs/2011-10-18.requirement-object @@ -0,0 +1,6 @@ +require="__broken_type/foo" breaks too late + +- always catch OSError/IOError: (check all occurences) +- type __director does not exist, abort in emulator + - if called type is not existing + - if required type is not existing