vm: raise CalledProcessError on failed service/command call

QubesOS · Jun 20, 2017 · 6044325 · 6044325
1 parent 51a17ba
commit 6044325
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
@@ -1095,10 +1095,8 @@ def run_service_for_stdio(self, *args, input=None, **kwargs):
         stdouterr = yield from p.communicate(input=input)
 
         if p.returncode:
-            raise qubes.exc.QubesVMError(self,
-                'service {!r} failed with retcode {!r}; '
-                'stdout={!r} stderr={!r}'.format(
-                    args[0], p.returncode, *stdouterr))
+            raise subprocess.CalledProcessError(p.returncode,
+                args[0], *stdouterr)
 
         return stdouterr
 
@@ -1142,10 +1140,8 @@ def run_for_stdio(self, *args, input=None, **kwargs):
         stdouterr = yield from p.communicate(input=input)
 
         if p.returncode:
-            raise qubes.exc.QubesVMError(self,
-                'service {!r} failed with retcode {!r}; '
-                'stdout={!r} stderr={!r}'.format(
-                    args[0], p.returncode, *stdouterr))
+            raise subprocess.CalledProcessError(p.returncode,
+                args[0], *stdouterr)
 
         return stdouterr