Merge lp:~ltrager/maas-images/lp1609804 into lp:maas-images

[Lee Trager]

Take SHA256 and size of squashfs image in create_version.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'meph2/commands/cloudimg_sync.py'
--- meph2/commands/cloudimg_sync.py	2016-08-18 09:41:53 +0000
+++ meph2/commands/cloudimg_sync.py	2016-08-24 05:09:03 +0000
@@ -13,7 +13,6 @@
 import argparse
 import glob
 import copy
-import hashlib
 import os
 import sys
 import yaml
@@ -126,19 +125,6 @@
         self.content_t = my_prods
         return v2_to_cloudimg_products(my_prods, rebuilds=self.rebuilds)
 
-    def _verify_sha256(self, filename, expected_sha256):
-        sha256 = hashlib.sha256()
-        with open(filename, 'rb') as f:
-            while True:
-                data = f.read(2**18)
-                if not data:
-                    break
-                sha256.update(data)
-        if sha256.hexdigest() != expected_sha256:
-            raise ValueError(
-                'Expected SHA256 %s got %s on %s' %
-                (expected_sha256, sha256.hexdigest(), filename))
-
     def insert_item(self, data, src, target, pedigree, contentsource):
         # create the ephemeral root
 
@@ -162,13 +148,12 @@
             for i in items:
                 filename = os.path.join(self.out_d, items[i]['path'])
                 if i == 'squashfs':
-                    if self.squashfs:
-                        # Verify upstream SHA256 of SquashFS images and add the
-                        # SHA256 and size to our stream.
-                        self._verify_sha256(filename, flat['sha256'])
-                        items[i]['sha256'] = flat['sha256']
-                        items[i]['size'] = int(flat['size'])
-                    else:
+                    # Verify upstream SHA256 of SquashFS image.
+                    if items[i]['sha256'] != flat['sha256']:
+                        raise ValueError(
+                            'Expected SHA256 %s got %s on %s' %
+                            (flat['sha256'], items[i]['sha256'], filename))
+                    if not self.squashfs:
                         # If we're not publishing the SquashFS image but one
                         # was used to generate root-image.gz delete it.
                         if os.path.exists(filename):

=== modified file 'meph2/stream.py'
--- meph2/stream.py	2016-08-18 09:41:53 +0000
+++ meph2/stream.py	2016-08-24 05:09:03 +0000
@@ -154,6 +154,7 @@
         ikeys = boot_keys + ['root-image.gz', 'manifest']
         if img_url.endswith('.squashfs'):
             ikeys += ['squashfs']
+            newpaths.add(PATH_FORMATS['squashfs'] % subs)
 
         dtb = kdata.get('dtb')
         if dtb: