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

diff --git a/python/invirt/remctl.py b/python/invirt/remctl.py
index a97e422..d530d7a 100644
--- a/python/invirt/remctl.py
+++ b/python/invirt/remctl.py
@@ -36,6 +36,10 @@ 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:
-        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()