X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fcommon%2Fpackage_tool.py;h=abdcd3c173ff603f9f8bcc3ce03f00aee36289cc;hb=refs%2Fchanges%2F88%2F12188%2F6;hp=985a44734fa645d8c6f9b34ffc62e821dde6db2e;hpb=12b478cb4a6b2dd74d61c4e7272fb0eda635c8b9;p=osm%2Fosmclient.git diff --git a/osmclient/common/package_tool.py b/osmclient/common/package_tool.py index 985a447..abdcd3c 100644 --- a/osmclient/common/package_tool.py +++ b/osmclient/common/package_tool.py @@ -16,7 +16,6 @@ # under the License. import glob -import hashlib import logging import os import shutil @@ -29,6 +28,7 @@ from osm_im.validation import ValidationException from osm_im import im_translation from osmclient.common import package_handling as package_handling from osmclient.common.exceptions import ClientException +from osmclient.common import utils from .sol004_package import SOL004Package from .sol007_package import SOL007Package import yaml @@ -396,13 +396,7 @@ class PackageTool(object): for file_item in files: if "checksums.txt" in file_item: continue - # from https://www.quickprogrammingtips.com/python/how-to-calculate-md5-hash-of-a-file-in-python.html - md5_hash = hashlib.md5() - with open(file_item, "rb") as f: - # Read and update hash in chunks of 4K - for byte_block in iter(lambda: f.read(4096), b""): - md5_hash.update(byte_block) - checksum.write("{}\t{}\n".format(md5_hash.hexdigest(), file_item)) + checksum.write("{}\t{}\n".format(utils.md5(file_item), file_item)) def create_folders(self, folders, package_type): """