Index: trunk/packages/invirt-base/debian/changelog
===================================================================
--- trunk/packages/invirt-base/debian/changelog	(revision 2095)
+++ trunk/packages/invirt-base/debian/changelog	(revision 2097)
@@ -1,8 +1,2 @@
-invirt-base (0.0.21) unstable; urgency=low
-
-  * Get rid of confusing err=True option to invirt.remctl.remctl
-
- -- Evan Broder <broder@mit.edu>  Fri, 30 Jan 2009 19:49:46 -0500
-
 invirt-base (0.0.20) unstable; urgency=low
 
Index: trunk/packages/invirt-base/python/invirt/common.py
===================================================================
--- trunk/packages/invirt-base/python/invirt/common.py	(revision 2095)
+++ trunk/packages/invirt-base/python/invirt/common.py	(revision 2097)
@@ -76,7 +76,5 @@
 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
 
 #
Index: trunk/packages/invirt-base/python/invirt/remctl.py
===================================================================
--- trunk/packages/invirt-base/python/invirt/remctl.py	(revision 2095)
+++ trunk/packages/invirt-base/python/invirt/remctl.py	(revision 2097)
@@ -37,5 +37,9 @@
                          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()