[dak/master] generate shasums if necessary due to old changes format
Signed-off-by: Mark Hymers <mhy@debian.org>
---
dak/import_new_files.py | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dak/import_new_files.py b/dak/import_new_files.py
index 253e656..8e1958b 100755
--- a/dak/import_new_files.py
+++ b/dak/import_new_files.py
@@ -86,15 +86,27 @@ class ImportNewFiles(object):
files=[]
for chg_fn in u.pkg.files.keys():
+ f = open(chg_fn)
cpf = ChangePendingFile()
cpf.filename = chg_fn
cpf.size = u.pkg.files[chg_fn]['size']
cpf.md5sum = u.pkg.files[chg_fn]['md5sum']
- cpf.sha1sum = u.pkg.files[chg_fn]['sha1sum']
- cpf.sha256sum = u.pkg.files[chg_fn]['sha256sum']
+
+ if u.pkg.files[chg_fn].has_key('sha1sum'):
+ cpf.sha1sum = u.pkg.files[chg_fn]['sha1sum']
+ else:
+ log.warning("Having to generate sha1sum for %s" % chg_fn)
+ cpf.sha1sum = apt_pkg.sha1sum(f)
+
+ if u.pkg.files[chg_fn].has_key('sha256sum'):
+ cpf.sha256sum = u.pkg.files[chg_fn]['sha256sum']
+ else:
+ log.warning("Having to generate sha256sum for %s" % chg_fn)
+ cpf.sha256sum = apt_pkg.sha256sum(f)
session.add(cpf)
files.append(cpf)
+ f.close()
chg.files = files
--
1.6.3.3
Reply to: