Merge github 8bb6676 (use streaming sha256 when linking to sourcepool)

diff --git a/raspbmirror.py b/raspbmirror.py
index b6db72a024aa0b28582e794b473d99de73f868c9..2a8f8ffa93ad840eea8a18fb4d7daabed8986c4b 100644 (file)
--- a/raspbmirror.py
+++ b/raspbmirror.py
@@ -254,11 +254,7 @@ def getfile(path,sha256,size):
                                if os.path.isfile(spp)  and (size == os.path.getsize(spp)):
                                        logging.info('trying file from sourcepool '+spp.decode('ascii'))
                                        ts = os.path.getmtime(spp)
-                                       f = open(spp,'rb')
-                                       data = f.read()
-                                       f.close()
-                                       sha256hash = hashlib.sha256(data)
-                                       sha256hashed = sha256hash.hexdigest().encode('ascii')
+                                       [ sha256hashed, size ] = getfilesha256andsize(spp);
                                        if (sha256 != sha256hashed):
                                                logging.info('hash mismatch while trying file from sourcepool, ignoring file');
                                                data = None