diff options
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-info | 12 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 4654359f7..853c98845 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -231,10 +231,14 @@ class InfoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore): print("Refusing to write files outside of /tmp without -f " "option") return - lxml.etree.ElementTree(self.BuildConfiguration(client)).write( - ofile, - encoding='UTF-8', xml_declaration=True, - pretty_print=True) + try: + lxml.etree.ElementTree(self.BuildConfiguration(client)).write( + ofile, + encoding='UTF-8', xml_declaration=True, + pretty_print=True) + except IOError: + err = sys.exc_info()[1] + print("Failed to write File %s: %s" % (ofile, err)) else: print(self._get_usage(self.do_build)) diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 95413d6cf..beb19cef6 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -37,8 +37,8 @@ def main(): coremodule = backends[setup['backend']] try: - Core = getattr(__import__("Bcfg2.Server.%s" % coremodule).Server, - coremodule).Core + corecls = getattr(__import__("Bcfg2.Server.%s" % coremodule).Server, + coremodule).Core except ImportError: err = sys.exc_info()[1] print("Unable to import %s server core: %s" % (setup['backend'], err)) @@ -49,7 +49,7 @@ def main(): raise try: - core = Core() + core = corecls(setup) core.run() except CoreInitError: msg = sys.exc_info()[1] |