Merge lp:~cprov/core-image-watcher/fix-udf-call into lp:core-image-watcher

[Celso Providelo]

Fix u-d-f call (typo, extra space) and other minor style tweaks.

Fix u-d-f call (typo, extra space) and other minor style tweaks.

[Francis Ginther (fginther)]

There was a typo that was forcing the use of shell=True that can be fixed. Otherwise the style tweaks look good.

review: Needs Fixing

[lp:~cprov/core-image-watcher/fix-udf-call]

10. By Celso Providelo on 2015-03-28

Fixed the u-d-f cmdline typo and remove shell=True

[Celso Providelo (cprov)]

Comments addressed, Francis. Thanks for double checking my hack.

[Francis Ginther (fginther)]

Approve.

review: Approve

=== modified file 'core_image_watcher/__init__.py'
--- core_image_watcher/__init__.py	2015-03-27 13:51:39 +0000
+++ core_image_watcher/__init__.py	2015-03-28 11:58:12 +0000
@@ -44,19 +44,20 @@
             queue.put(body)
             queue.close()
         except Exception as exc:
-            logger.error(exc, exc_info=True)
+            logger.error(exc, exc_info=True, extra=body)
         logger.info('Done!', extra=body)
 
 
 def _get_version_string_output(channel, device):
     """Obtains a bytestring of the images info from the core image server"""
-    cmd = ['ubuntu-device-flash',
-           'query ',
-           '--list-images',
-           '--channel',
-           'ubuntu-core/{}'.format(channel),
-           '--device={}'.format(device)]
-    images = None
+    cmd = [
+        'ubuntu-device-flash',
+        'query',
+        '--list-images',
+        '--channel=ubuntu-core/{}'.format(channel),
+        '--device={}'.format(device),
+    ]
+    images = b''
     try:
         images = subprocess.check_output(cmd)
     except subprocess.CalledProcessError as e:
@@ -72,9 +73,9 @@
     images = get_output(channel, device).split()
     if (len(images) >= 2):
         return images[-2].decode('utf-8').replace(':', '')
-    else:
-        logger.info('Could not get the image list by u-d-f')
-        return None
+
+    logger.error('Could not get the image list by u-d-f: %s', images)
+    return None
 
 
 def _cache_version_to_disk(location, latest_version):
@@ -92,7 +93,7 @@
                 f.write(latest_version)
     except IOError as e:
         latest_version = None
-        logger.error('Writing the latest image info failed: %s', (str(e)))
+        logger.error('Writing the latest image info failed: %s', str(e))
     finally:
         return latest_version
 
@@ -113,10 +114,11 @@
     except Exception as e:
         logger.error(e, exc_info=True)
         return None
-    body = {}
-    body['image_name'] = latest_version
-    body['channel'] = channel
-    body['device'] = device
+    body = {
+        'image_name': latest_version,
+        'channel': channel,
+        'device': device,
+    }
     return body