X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-base.git/blobdiff_plain/ba7a8b6d0f227117980f61284b999ce3f81209a4..2af15185c622627958493cc93ec6174998c48d8f:/python/invirt/remctl.py

diff --git a/python/invirt/remctl.py b/python/invirt/remctl.py
index d530d7a..a97e422 100644
--- a/python/invirt/remctl.py
+++ b/python/invirt/remctl.py
@@ -36,10 +36,6 @@ def remctl(host, *args, **kws):
                          stdout=subprocess.PIPE,
                          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()