summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Admin/Init.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-04-26 20:07:47 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-04-26 20:07:47 -0500
commit7f68ebb4ce4cb65850a63660f2f1cec06100064a (patch)
treefb8fb3af8f11c5489315022924cd9d7146a666c0 /src/lib/Server/Admin/Init.py
parentcca5e6a474adf1453408909979143233d54ed2be (diff)
downloadbcfg2-7f68ebb4ce4cb65850a63660f2f1cec06100064a.tar.gz
bcfg2-7f68ebb4ce4cb65850a63660f2f1cec06100064a.tar.bz2
bcfg2-7f68ebb4ce4cb65850a63660f2f1cec06100064a.zip
Admin: Add full PY3K compatibility
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Server/Admin/Init.py')
-rw-r--r--src/lib/Server/Admin/Init.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index 9771fd10b..9fd408585 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -157,7 +157,8 @@ def create_conf(confpath, confdata):
try:
open(confpath, "w").write(confdata)
os.chmod(keypath, stat.S_IRUSR|stat.S_IWUSR) # 0600
- except Exception, e:
+ except Exception:
+ e = sys.exc_info()[1]
print("Error %s occured while trying to write configuration "
"file to '%s'.\n" %
(e, confpath))
@@ -381,7 +382,8 @@ class Init(Bcfg2.Server.Admin.Mode):
'', ["Bcfg2.Server.Plugins"])
cls = getattr(module, plugin)
cls.init_repo(self.repopath)
- except Exception, e:
+ except Exception:
+ e = sys.exc_info()[1]
print("Plugin setup for %s failed: %s\n"
"Check that dependencies are installed?" % (plugin, e))