Merge lp:~deeptik/linaro-fetch-image/catch-lit-exception into lp:linaro-fetch-image

[Deepti B. Kalakeri]

 Adding changes in order to catch lit error message, required for ci* jobs

[lp:~deeptik/linaro-fetch-image/catch-lit-exception]

25. By Deepti B. Kalakeri on 2012-10-16

Improving the subprocess.CalledProcessError exception

[James Tunnicliffe (dooferlad)]

Looks good.

review: Approve

[James Tunnicliffe (dooferlad)]

I will merge - the only issue was some lines were >80 chars long. Have fixed.

=== modified file 'linaro-fetch-image'
--- linaro-fetch-image	2012-10-12 11:47:14 +0000
+++ linaro-fetch-image	2012-10-16 10:45:25 +0000
@@ -25,6 +25,7 @@
 import linaro_fetch_image.fetch_image as fetch_image
 import logging
 import pprint
+import subprocess
 
 
 def main():
@@ -66,43 +67,48 @@
 
     # Using the config we have, look up URLs to download data from in the
     # server index
+    try:
+        if config.args['platform'] == 'all':
+            # Get release builds for specific  image type, for example nano
+            release_list = config.get_release_list(db, config.settings)
+            platform_list = config.get_release_list_specific_to_image(release_list,
+                                                                      config.args)
+            for platform in platform_list:
+                config.args['platform'] = platform
+                image_url, hwpack_url = db.get_image_and_hwpack_urls(config.args)
+                if(image_url and hwpack_url):
+                    if config.args['exit']:
+                        exit(0)
+                    tools_dir = os.path.dirname(__file__)
+                    if tools_dir == '':
+                        tools_dir = None
+                    file_handler.create_media(image_url, hwpack_url,
+                                              config.args, tools_dir)
+                else:
+                    logging.error("Unable to find files that match the '%s' "
+                                  "release", platform)
 
-    if config.args['platform'] == 'all':
-        # Get release builds for specific  image type, for example nano
-        release_list = config.get_release_list(db, config.settings)
-        platform_list = config.get_release_list_specific_to_image(release_list,
-                                                                  config.args)
-        for platform in platform_list:
-            config.args['platform'] = platform
+        else:
             image_url, hwpack_url = db.get_image_and_hwpack_urls(config.args)
-            if(image_url and hwpack_url):
+    
+            if(image_url and (hwpack_url or config.args['image'] == "android")):
                 if config.args['exit']:
                     exit(0)
                 tools_dir = os.path.dirname(__file__)
                 if tools_dir == '':
                     tools_dir = None
+
                 file_handler.create_media(image_url, hwpack_url,
                                           config.args, tools_dir)
+
             else:
-                logging.error("Unable to find files that match the '%s' "
-                              "release", platform)
-
-    else:
-        image_url, hwpack_url = db.get_image_and_hwpack_urls(config.args)
-
-        if(image_url and (hwpack_url or config.args['image'] == "android")):
-            if config.args['exit']:
-                exit(0)
-            tools_dir = os.path.dirname(__file__)
-            if tools_dir == '':
-                tools_dir = None
-
-            file_handler.create_media(image_url, hwpack_url,
-                                      config.args, tools_dir)
-        else:
-            logging.error(
-                "Unable to find files that match the parameters specified")
-            exit(1)
+                logging.error(
+                    "Unable to find files that match the parameters specified")
+                exit(1)
+    except subprocess.CalledProcessError, err_det:
+        print "Command: ", err_det.cmd, err_det.output
+        print "Image build failed"
+        exit(1)
 
 if __name__ == '__main__':
     main()

=== modified file 'linaro_fetch_image/fetch_image.py'
--- linaro_fetch_image/fetch_image.py	2012-10-12 13:32:13 +0000
+++ linaro_fetch_image/fetch_image.py	2012-10-16 10:45:25 +0000
@@ -758,6 +758,9 @@
 
         self.create_process = subprocess.Popen(lmc_command)
         self.create_process.wait()
+        if  self.create_process.returncode:
+            raise subprocess.CalledProcessError(1, lmc_command, 'Failed')
+        
 
     class LinaroMediaCreate(threading.Thread):
         """Thread class for running linaro-media-create"""