From 7d80a5355cb540aae8d3082c1efebb72da4f93c6 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 15 Dec 2010 15:13:07 -0700 Subject: process: handle OSErrors other than file not found Signed-off-by: Chris Larson --- lib/bb/process.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/bb/process.py b/lib/bb/process.py index f02332df9..dc97e3f72 100644 --- a/lib/bb/process.py +++ b/lib/bb/process.py @@ -10,8 +10,9 @@ def subprocess_setup(): signal.signal(signal.SIGPIPE, signal.SIG_DFL) class CmdError(RuntimeError): - def __init__(self, command): + def __init__(self, command, message=None): self.command = command + self.message = message def __str__(self): if not isinstance(self.command, basestring): @@ -19,7 +20,10 @@ class CmdError(RuntimeError): else: cmd = self.command - return "Execution of '%s' failed" % cmd + msg = "Execution of '%s' failed" % cmd + if self.message: + msg += ': %s' % self.message + return msg class NotFoundError(CmdError): def __str__(self): @@ -94,7 +98,7 @@ def run(cmd, input=None, **options): if exc.errno == 2: raise NotFoundError(cmd) else: - raise + raise CmdError(cmd, exc) if log: stdout, stderr = _logged_communicate(pipe, log, input) -- cgit 1.2.3-korg