Merge commit 'ftpmaster/master'

[dak.git] / dak / generate_index_diffs.py

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 3fe86e112d18d01cc8fafe18a0ee9cd049827840..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
 
 ################################################################################
 
@@ -254,11 +256,8 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         if not os.path.isdir(outdir):
             os.mkdir(outdir)
 
-        cmd = "diff --ed - %s | gzip -c -9 > %s.gz" % (newfile, difffile)
-        # Do we need shell=True?
-        w = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE).stdin
-
-        # I bet subprocess can do that better than this, but lets do little steps
+        w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" %
+                     (newfile, difffile), "w")
         pipe_file(oldf, w)
         oldf.close()
 
@@ -281,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)
 
@@ -312,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()
 
@@ -325,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")