Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  temporarily remove p-u from version checking

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

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 2b06146b3b1e00aeff6bfaacebe56cbd0932605d..774e0467d99efd0673159f65378164d9d0b97048 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -37,7 +37,9 @@ import tempfile
 import subprocess
 import time
 import apt_pkg
+import pg
 from daklib import utils
+from daklib import database
 
 ################################################################################
 
@@ -278,7 +280,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
 
 
 def main():
-    global Cnf, Options, Logger
+    global Cnf, Options, Logger, projectB
 
     os.umask(0002)
 
@@ -309,6 +311,9 @@ def main():
 
     if Options.has_key("RootDir"): Cnf["Dir::Root"] = Options["RootDir"]
 
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
+    database.init(Cnf, projectB)
+
     if not suites:
         suites = Cnf.SubTree("Suite").List()
 
@@ -322,7 +327,9 @@ def main():
 
         suite = suite.lower()
 
-        architectures = SuiteBlock.ValueList("Architectures")
+        architectures = database.get_suite_architectures(suite)
+        if architectures == None:
+            architectures = []
 
         if SuiteBlock.has_key("Components"):
             components = SuiteBlock.ValueList("Components")

diff --git a/dak/process_new.py b/dak/process_new.py
index d7519c7e4fddea340d78c1f51e219e6124f12734..acc4522f31046141babcefb776017e14194df674 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -736,7 +736,7 @@ def init():
             Cnf["Process-New::Options::%s" % (i)] = ""
 
     changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
-    if len(changes_files) == 0:
+    if len(changes_files) == 0 and not Cnf.get("Process-New::Options::Comments-Dir",""):
         changes_files = utils.get_changes_files(Cnf["Dir::Queue::New"])
 
     Options = Cnf.SubTree("Process-New::Options")