Changeset 2095 for trunk/packages/invirt-base/python/invirt

Timestamp:

Feb 5, 2009, 3:19:30 AM (16 years ago)

Author:

broder

Message:

Get rid of confusing err=True option to invirt.remctl.remctl.

Location:

trunk/packages/invirt-base/python/invirt

Files:

• common.py (modified) (1 diff)
• remctl.py (modified) (1 diff)

trunk/packages/invirt-base/python/invirt/common.py

@@ -76 +76 @@
 class CodeError(Exception):
     """Exception for internal errors or bad faith input."""
-    pass
+    def __init__(self, message, code=None):
+        Exception.__init__(self, message)
+        self.code = code
 
 #

trunk/packages/invirt-base/python/invirt/remctl.py

@@ -37 +37 @@
                          stderr=subprocess.PIPE)
     v = p.wait()
-    if kws.get('err'):
-        return p.stdout.read(), p.stderr.read()
     if v:
-        print >> sys.stderr, 'Error', v, 'on remctl', args, ':'
-        print >> sys.stderr, p.stderr.read()
-        raise CodeError('ERROR on remctl')
+        raise CodeError('ERROR on remctl %s:\n%s' % (args, p.stderr.read()), v)
     return p.stdout.read()