From 6ae66c595d4f85802045734ed1b230a292f9c953 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 20 Aug 2010 13:26:24 +0100
Subject: Better error message on subprocess spawn fail, and it's a
 ProcessExecutionException irrespective of how the process is run.

---
 nova/utils.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index dc3c626ec..b8abb5388 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -36,6 +36,16 @@ from nova import flags
 FLAGS = flags.FLAGS
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
+class ProcessExecutionError(IOError):
+    def __init__(   self, stdout=None, stderr=None, exit_code=None, cmd=None,
+                    description=None):
+        if description is None:
+            description = "Unexpected error while running command."
+        if exit_code is None:
+            exit_code = '-'
+        message = "%s\nCommand: %s\nExit code: %s\nStdout: %r\nStderr: %r" % (
+                  description, cmd, exit_code, stdout, stderr)
+        IOError.__init__(self, message)
 
 def import_class(import_str):
     """Returns a class from a string including module and class"""
@@ -73,8 +83,11 @@ def execute(cmd, process_input=None, addl_env=None, check_exit_code=True):
     if obj.returncode:
         logging.debug("Result was %s" % (obj.returncode))
         if check_exit_code and obj.returncode <> 0:
-            raise Exception(    "Unexpected exit code: %s.  result=%s" 
-                                % (obj.returncode, result))
+            (stdout, stderr) = result
+            raise ProcessExecutionError(exit_code=obj.returncode,
+                                        stdout=stdout,
+                                        stderr=stderr,
+                                        cmd=cmd)
     return result
 
 
-- 
cgit 


From fc5e1c6f0bee14fdb85ad138324062ceaa598eee Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Tue, 7 Sep 2010 21:53:40 -0700
Subject: a few formatting fixes and moved exception

---
 nova/utils.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index b8abb5388..d302412ad 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -31,21 +31,12 @@ import sys
 
 from nova import exception
 from nova import flags
+from nova.exception import ProcessExecutionError
 
 
 FLAGS = flags.FLAGS
 TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
 
-class ProcessExecutionError(IOError):
-    def __init__(   self, stdout=None, stderr=None, exit_code=None, cmd=None,
-                    description=None):
-        if description is None:
-            description = "Unexpected error while running command."
-        if exit_code is None:
-            exit_code = '-'
-        message = "%s\nCommand: %s\nExit code: %s\nStdout: %r\nStderr: %r" % (
-                  description, cmd, exit_code, stdout, stderr)
-        IOError.__init__(self, message)
 
 def import_class(import_str):
     """Returns a class from a string including module and class"""
@@ -118,8 +109,10 @@ def runthis(prompt, cmd, check_exit_code = True):
     exit_code = subprocess.call(cmd.split(" "))
     logging.debug(prompt % (exit_code))
     if check_exit_code and exit_code <> 0:
-        raise Exception(    "Unexpected exit code: %s from cmd: %s" 
-                            % (exit_code, cmd))
+        raise ProcessExecutionError(exit_code=exit_code,
+                                    stdout=None,
+                                    stderr=None,
+                                    cmd=cmd)
 
 
 def generate_uid(topic, size=8):
-- 
cgit