Merge remote-tracking branch 'ansgar/p-s-from-db' into merge

* ansgar/p-s-from-db:
  generate-packages-sources2: respect overridesuite
  process-upload: Add counter for rejected packages

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

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index c23ede9bcd3a2a246e3a1a71d76b3a935a825642..f055aa56ee1acce23a5f8b04fd0cbd4be9c399c9 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -89,7 +89,7 @@ JOIN priority pri ON o.priority = pri.id
 
 WHERE
   sa.suite = :suite
-  AND o.suite = :suite AND o.component = :component AND o.type = :dsc_type
+  AND o.suite = :overridesuite AND o.component = :component AND o.type = :dsc_type
 
 ORDER BY
 s.source, s.version
@@ -104,11 +104,13 @@ def generate_sources(suite_id, component_id):
     suite = session.query(Suite).get(suite_id)
     component = session.query(Component).get(component_id)
 
+    overridesuite_id = suite.get_overridesuite().suite_id
+
     writer = SourcesFileWriter(suite=suite.suite_name, component=component.component_name)
     output = writer.open()
 
     # run query and write Sources
-    r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "dsc_type": dsc_type})
+    r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "dsc_type": dsc_type, "overridesuite": overridesuite_id})
     for (stanza,) in r:
         print >>output, stanza
         print >>output, ""
@@ -188,7 +190,7 @@ WHERE
       (architecture = :arch_all AND source NOT IN (SELECT DISTINCT source FROM tmp WHERE architecture <> :arch_all))
   )
   AND
-    o.type = :type_id AND o.suite = :suite AND o.component = :component
+    o.type = :type_id AND o.suite = :overridesuite AND o.component = :component
 
 ORDER BY tmp.package, tmp.version
 """
@@ -204,12 +206,15 @@ def generate_packages(suite_id, component_id, architecture_id, type_name):
     component = session.query(Component).get(component_id)
     architecture = session.query(Architecture).get(architecture_id)
 
+    overridesuite_id = suite.get_overridesuite().suite_id
+
     writer = PackagesFileWriter(suite=suite.suite_name, component=component.component_name,
             architecture=architecture.arch_string, debtype=type_name)
     output = writer.open()
 
     r = session.execute(_packages_query, {"suite": suite_id, "component": component_id,
-        "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id})
+        "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id,
+        "overridesuite": overridesuite_id})
     for (stanza,) in r:
         print >>output, stanza
         print >>output, ""

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 22c333c9910a86cf8148492f28a18ea1c724a1e2..12e25a3352316be03144f6c12f9d1facfa1c98fb 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -503,6 +503,13 @@ def main():
                                                 utils.size_type(int(summarystats.accept_bytes)))
         Logger.log(["total", summarystats.accept_count, summarystats.accept_bytes])
 
+    if summarystats.reject_count:
+        sets = "set"
+        if summarystats.reject_count > 1:
+            sets = "sets"
+        print "Rejected %d package %s." % (summarystats.reject_count, sets)
+        Logger.log(["rejected", summarystats.reject_count])
+
     byebye()
 
     if not Options["No-Action"]:

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 482ec471bf64db2391ed833266fd766192d5aa01..d39f8c582903b553d689da9bf508fa6104b5a729 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2872,6 +2872,12 @@ class Suite(ORMObject):
         return session.query(DBSource).filter_by(source = source). \
             with_parent(self)
 
+    def get_overridesuite(self):
+        if self.overridesuite is None:
+            return self
+        else:
+            return object_session(self).query(Suite).filter_by(suite_name=self.overridesuite).one()
+
 __all__.append('Suite')
 
 @session_wrapper

diff --git a/daklib/queue.py b/daklib/queue.py
index 6317e5bac6e2650004b5d757c8d3d33015b25da0..c81ef8ea20fbee5dd0f8a2918a2447a4ea142c7d 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2451,6 +2451,8 @@ distribution."""
         if self.logger:
             self.logger.log(["rejected", self.pkg.changes_file])
 
+        stats = SummaryStats()
+        stats.reject_count += 1
         return 0
 
     ################################################################################

diff --git a/daklib/summarystats.py b/daklib/summarystats.py
index 60702c3d10d3535de7df32cebe1e7a9ea5df95a9..f678ec25e487a1b4fa9fa6cfd9e40716eebffaba 100644 (file)
--- a/daklib/summarystats.py
+++ b/daklib/summarystats.py
@@ -35,8 +35,11 @@ class SummaryStats(object):
         if not getattr(self, 'initialised', False):
             self.initialised = True
             self.reset_accept()
+            self.reset_reject()
 
     def reset_accept(self):
         self.accept_count = 0
         self.accept_bytes = 0
 
+    def reset_reject(self):
+        self.reject_count = 0