Merge branch 'merge'

[dak.git] / dak / generate_index_diffs.py

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 724a225f6d2cb095e91fd1f954741dce338161c0..7e4b0058e335186a26d609ee5e5cb18ad0d6165d 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -34,12 +34,11 @@
 import sys
 import os
 import tempfile
-import subprocess
 import time
 import apt_pkg
 
 from daklib import utils
-from daklib.dbconn import get_suite
+from daklib.dbconn import get_suite, get_suite_architectures
 
 ################################################################################
 
@@ -255,7 +254,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         if not os.path.isdir(outdir):
             os.mkdir(outdir)
 
-        w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" %
+        w = os.popen("diff --ed - %s | gzip --rsyncable -c -9 > %s.gz" %
                      (newfile, difffile), "w")
         pipe_file(oldf, w)
         oldf.close()
@@ -314,13 +313,13 @@ def main():
         suites = Cnf.SubTree("Suite").List()
 
     for suitename in suites:
-        print "Processing: " + suite
+        print "Processing: " + suitename
         SuiteBlock = Cnf.SubTree("Suite::" + suitename)
 
         suiteobj = get_suite(suitename.lower())
 
         # Use the canonical version of the suite name
-        suite = suite.suite_name
+        suite = suiteobj.suite_name
 
         if suiteobj.untouchable:
             print "Skipping: " + suite + " (untouchable)"