process: handle OSErrors other than file not found

(Bitbake rev: 7d80a5355cb540aae8d3082c1efebb72da4f93c6)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bitbake/lib/bb/process.py b/bitbake/lib/bb/process.py
index f02332df9adfba566bed3269c97cb37258e2c1ec..dc97e3f72f797840b90b6a73dea9d02ba5dea734 100644 (file)
--- a/bitbake/lib/bb/process.py
+++ b/bitbake/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)