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 286c1eba7f3ed870ead854ff7b395fb17c1ba6b8..774e0467d99efd0673159f65378164d9d0b97048 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 
+""" generates partial package updates list"""
+
 ###########################################################
-# generates partial package updates list
 
 # idea and basic implementation by Anthony, some changes by Andreas
 # parts are stolen from 'dak generate-releases'
@@ -30,9 +31,15 @@
 
 ################################################################################
 
-import sys, os, tempfile
+import sys
+import os
+import tempfile
+import subprocess
+import time
 import apt_pkg
+import pg
 from daklib import utils
+from daklib import database
 
 ################################################################################
 
@@ -231,18 +238,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
 
     if upd.filesizesha1:
         if upd.filesizesha1 != oldsizesha1:
-            print "warning: old file seems to have changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1)
-
-    # XXX this should be usable now
-    #
-    #for d in upd.history.keys():
-    #    df = smartopen("%s/%s" % (outdir,d))
-    #    act_sha1size = sizesha1(df)
-    #    df.close()
-    #    exp_sha1size = upd.history[d][1]
-    #    if act_sha1size != exp_sha1size:
-    #        print "patch file %s seems to have changed! %s %s => %s %s" % \
-    #            (d,) + exp_sha1size + act_sha1size
+            print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1)
 
     if Options.has_key("CanonicalPath"): upd.can_path=Options["CanonicalPath"]
 
@@ -257,9 +253,11 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         oldf.close()
         print "%s: unchanged" % (origfile)
     else:
-        if not os.path.isdir(outdir): os.mkdir(outdir)
+        if not os.path.isdir(outdir):
+            os.mkdir(outdir)
+
         w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" %
-                         (newfile, difffile), "w")
+                     (newfile, difffile), "w")
         pipe_file(oldf, w)
         oldf.close()
 
@@ -282,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)
 
@@ -306,16 +304,16 @@ def main():
 
     if not Options.has_key("PatchName"):
         format = "%Y-%m-%d-%H%M.%S"
-        i,o = os.popen2("date +%s" % (format))
-        i.close()
-        Options["PatchName"] = o.readline()[:-1]
-        o.close()
+        Options["PatchName"] = time.strftime( format )
 
     AptCnf = apt_pkg.newConfiguration()
     apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
 
     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()
 
@@ -329,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")