Check whether some mandatory keys are available

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index f6593394645c2c385fbf5ead34830b2bc83c5422..9d1e386653930709661aef190d85885a726b6804 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -51,7 +51,7 @@ from holding import Holding
 from urgencylog import UrgencyLog
 from dbconn import *
 from summarystats import SummaryStats
-from utils import parse_changes, check_dsc_files, build_package_set
+from utils import parse_changes, check_dsc_files, build_package_list
 from textutils import fix_maintainer
 from lintian import parse_lintian_output, generate_reject_messages
 from contents import UnpackedSource
@@ -133,8 +133,8 @@ def determine_new(filename, changes, files, warn=1, session = None, dsc = None,
 
     # Try to get the Package-Set field from an included .dsc file (if possible).
     if dsc:
-        for package, entry in build_package_set(dsc, session).items():
-            if not new.has_key(package):
+        for package, entry in build_package_list(dsc, session).items():
+            if package not in new:
                 new[package] = entry
 
     # Build up a list of potentially new things
@@ -290,9 +290,9 @@ class TarTime(object):
 
     def callback(self, member, data):
         if member.mtime > self.future_cutoff:
-            self.future_files[Name] = MTime
+            self.future_files[Name] = member.mtime
         if member.mtime < self.past_cutoff:
-            self.ancient_files[Name] = MTime
+            self.ancient_files[Name] = member.mtime
 
 ###############################################################################
 
@@ -1657,6 +1657,9 @@ class Upload(object):
                     self.rejects.append("%s: deb contents timestamp check failed [%s: %s]" % (filename, sys.exc_info()[0], sys.exc_info()[1]))
 
     def check_if_upload_is_sponsored(self, uid_email, uid_name):
+        for key in "maintaineremail", "changedbyemail", "maintainername", "changedbyname":
+            if not self.pkg.changes.has_key(key):
+                return False
         uid_email = '@'.join(uid_email.split('@')[:2])
         if uid_email in [self.pkg.changes["maintaineremail"], self.pkg.changes["changedbyemail"]]:
             sponsored = False