From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 7 Sep 2008 21:50:29 +0000 (+0200)
Subject: Merge commit 'pkern/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=909521c4292bc9449eddd31b30dd31779a14c886;hp=48c57a23f6b131262961c78e192261455ff8ee81;p=dak.git

Merge commit 'pkern/master'

* commit 'pkern/master':
  do not check for superfluous checksums-* entries for now

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/daklib/utils.py b/daklib/utils.py
index 075e4a16..86e51a2f 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)):