diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index 1fbe1d3e3..e657d0709 100644 --- 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