Merge lp:~allenap/maas/simplestreams-moved-checksummer into lp:~maas-committers/maas/trunk

[Gavin Panella]

checksummer is no longer in the simplestreams.util module.

This plays it defensively and checks both the simplestreams.util and simplestreams.checksum_util modules for checksummer.

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/maasserver/bootresources.py'
--- src/maasserver/bootresources.py	2015-09-24 19:48:38 +0000
+++ src/maasserver/bootresources.py	2015-09-25 10:24:29 +0000
@@ -114,6 +114,12 @@
 from twisted.python import log
 
 
+try:
+    from simplestreams.checksum_util import checksummer
+except ImportError:
+    from simplestreams.util import checksummer
+
+
 maaslog = get_maas_logger("bootresources")
 
 # Used by maasserver.middleware.AccessMiddleware to allow
@@ -669,7 +675,7 @@
         """Writes the data from the given reader, into the object storage
         for the given `BootResourceFile`."""
         ident = self.get_resource_file_log_identifier(rfile)
-        cksummer = sutil.checksummer(
+        cksummer = checksummer(
             {'sha256': rfile.largefile.sha256})
         maaslog.debug("Finalizing boot image %s.", ident)