[dak/master] do not check for superfluous checksums-* entries for now
The current check for additional entries in checksums-* which are not
covered by entries in files is flawed because files could be modified
by autobyhand or sometimes when the file's already in the pool.
We need to rework this to look into the original files dict instead.
Signed-off-by: Philipp Kern <pkern@debian.org>
---
daklib/utils.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/daklib/utils.py b/daklib/utils.py
index 075e4a1..86e51a2 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -394,12 +394,15 @@ def parse_checksums(where, files, manifest, hashname):
if not line:
break
hash, size, file = line.strip().split(' ')
- if not files.has_key(file):
- rejmsg.append("%s: not present in files but in checksums-%s in %s" %
- (file, hashname, where))
+ # TODO: check for the file's entry in the original files dict, not
+ # the one modified by (auto)byhand and other weird stuff
+ #if not files.has_key(file):
+ # rejmsg.append("%s: not present in files but in checksums-%s in %s" %
+ # (file, hashname, where))
if not files[file]["size"] == size:
rejmsg.append("%s: size differs for files and checksums-%s entry "\
"in %s" % (file, hashname, where))
+ continue
files[file][hash_key(hashname)] = hash
for f in files.keys():
if not files[f].has_key(hash_key(hashname)):
--
1.5.6.3
Reply to: