summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-06-28 18:54:56 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-06-28 18:54:56 -0500
commitd3e30fa5f4c1ac2d2ac014f46139906c8e8eb18f (patch)
tree226dd3140e9d6fd9a1c4b03c50541355eae50d3e
parent9d701f9e122714382c5a399b3c069db8c034894f (diff)
downloadbcfg2-d3e30fa5f4c1ac2d2ac014f46139906c8e8eb18f.tar.gz
bcfg2-d3e30fa5f4c1ac2d2ac014f46139906c8e8eb18f.tar.bz2
bcfg2-d3e30fa5f4c1ac2d2ac014f46139906c8e8eb18f.zip
Admin/Xcmd: Use py3k-compatible xmlrpclib
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--src/lib/Bcfg2/Server/Admin/Xcmd.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py
index 2613f74ac..f7f30fd80 100644
--- a/src/lib/Bcfg2/Server/Admin/Xcmd.py
+++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py
@@ -1,10 +1,10 @@
""" XML-RPC Command Interface for bcfg2-admin"""
import sys
-import xmlrpclib
import Bcfg2.Options
import Bcfg2.Client.Proxy
import Bcfg2.Server.Admin
+from Bcfg2.Compat import xmlrpclib
class Xcmd(Bcfg2.Server.Admin.Mode):
@@ -31,7 +31,7 @@ class Xcmd(Bcfg2.Server.Admin.Mode):
cert=setup['certificate'],
ca=setup['ca'],
timeout=setup['timeout'])
- if len(setup['args']) == 0:
+ if len(setup['args']) == 0 or len(args) == 0:
self.errExit("Usage: xcmd <xmlrpc method> <optional arguments>")
cmd = args[0]
try: