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

Timestamp:

Feb 5, 2009, 3:24:56 AM (16 years ago)

Author:

broder

Message:

For now, revert r2093-2095, which were committed by accident; I'm not
comfortable with them sitting on HEAD when I don't have time to test
them.

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."""
-    def __init__(self, message, code=None):
-        Exception.__init__(self, message)
-        self.code = code
+    pass
 
 #

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:
-        raise CodeError('ERROR on remctl %s:\n%s' % (args, p.stderr.read()), v)
+        print >> sys.stderr, 'Error', v, 'on remctl', args, ':'
+        print >> sys.stderr, p.stderr.read()
+        raise CodeError('ERROR on remctl')
     return p.stdout.read()