diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-01 14:25:01 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-01 14:25:09 -0400 |
| commit | d7cdfbfd26e0581bd8eac1457a365eb86fe96ddf (patch) | |
| tree | 6072721d5326368207ff45f815dce6a217095a0f /src/lib/Bcfg2 | |
| parent | 5356f1451995dfefa64c42a77a64463e48601f5f (diff) | |
| download | bcfg2-d7cdfbfd26e0581bd8eac1457a365eb86fe96ddf.tar.gz bcfg2-d7cdfbfd26e0581bd8eac1457a365eb86fe96ddf.tar.bz2 bcfg2-d7cdfbfd26e0581bd8eac1457a365eb86fe96ddf.zip | |
fixed return values from toggle_debug xcmds
Diffstat (limited to 'src/lib/Bcfg2')
| -rw-r--r-- | src/lib/Bcfg2/SSLServer.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/SSLServer.py b/src/lib/Bcfg2/SSLServer.py index 6aa46ea58..33707eda8 100644 --- a/src/lib/Bcfg2/SSLServer.py +++ b/src/lib/Bcfg2/SSLServer.py @@ -45,7 +45,7 @@ class XMLRPCDispatcher (SimpleXMLRPCServer.SimpleXMLRPCDispatcher): params = (address, ) + params response = self.instance._dispatch(method, params, self.funcs) # py3k compatibility - if type(response) not in [bool, str, list, dict] or response is None: + if type(response) not in [bool, str, list, dict]: response = (response.decode('utf-8'), ) else: response = (response, ) diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py index 4e9199466..e71e51f4c 100644 --- a/src/lib/Bcfg2/Server/Plugin.py +++ b/src/lib/Bcfg2/Server/Plugin.py @@ -78,6 +78,9 @@ class Debuggable(object): def toggle_debug(self): self.debug_flag = not self.debug_flag + self.logger("%s: debug_flag = %s" % (self.__class__.__name__, + self.debug_flag)) + return self.debug_flag def debug_log(self, message, flag=None): if (flag is None and self.debug_flag) or flag: diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 72913a60a..5a804a4cd 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -40,8 +40,9 @@ class Packages(Bcfg2.Server.Plugin.Plugin, self.core.setup) def toggle_debug(self): - Bcfg2.Server.Plugin.Plugin.toggle_debug(self) + rv = Bcfg2.Server.Plugin.Plugin.toggle_debug(self) self.sources.toggle_debug() + return rv @property def disableResolver(self): |