From c9ae06db6428855a3d9d849efd1019346b203c06 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 13 Feb 2012 16:27:41 +0100 Subject: [PATCH] do not setup __debug - let the user do if required - do not interfere type with core Signed-off-by: Nico Schottelius --- doc/changelog | 2 ++ lib/cdist/core/code.py | 3 --- lib/cdist/core/explorer.py | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/changelog b/doc/changelog index c241624a..2d2d7a48 100644 --- a/doc/changelog +++ b/doc/changelog @@ -6,6 +6,8 @@ Changelog 2.0.8: * Cleanup: Better hint to source of error + * Cleanup: Remove support for __debug variable in manifests (Type != Core + debugging) 2.0.7: 2012-02-13 * Bugfix __file: Use chmod after chown/chgrp (Matt Coddington) diff --git a/lib/cdist/core/code.py b/lib/cdist/core/code.py index 7e69f21c..2ffef9cf 100644 --- a/lib/cdist/core/code.py +++ b/lib/cdist/core/code.py @@ -92,9 +92,6 @@ class Code(object): '__global': self.local.out_path, } - if log.getEffectiveLevel() == logging.DEBUG: - self.env.update({'__debug': "yes" }) - def _run_gencode(self, cdist_object, which): cdist_type = cdist_object.cdist_type script = os.path.join(self.local.type_path, getattr(cdist_type, 'gencode_%s_path' % which)) diff --git a/lib/cdist/core/explorer.py b/lib/cdist/core/explorer.py index bbd2108c..d49b7ac4 100644 --- a/lib/cdist/core/explorer.py +++ b/lib/cdist/core/explorer.py @@ -73,8 +73,6 @@ class Explorer(object): '__target_host': self.target_host, '__explorer': self.remote.global_explorer_path, } - if self.log.getEffectiveLevel() == logging.DEBUG: - self.env.update({'__debug': "yes" }) self._type_explorers_transferred = [] ### global