Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

[dak.git] / dak / generate_index_diffs.py

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 3a69f3a57e7b1b4c2a9f1e82b36455de1f6f763f..83d51824cdcb05efe37d8143b88eead762c58f3a 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -225,7 +225,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         return
 
     if oldstat[1:3] == origstat[1:3]:
-        print "%s: hardlink unbroken, assuming unchanged" % (origfile)
+        #print "%s: hardlink unbroken, assuming unchanged" % (origfile)
         return
 
     oldf = smartopen(oldfile)
@@ -234,9 +234,9 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
     # should probably early exit if either of these checks fail
     # alternatively (optionally?) could just trim the patch history
 
-    if upd.filesizesha1:
-        if upd.filesizesha1 != oldsizesha1:
-            print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1)
+    #if upd.filesizesha1:
+    #    if upd.filesizesha1 != oldsizesha1:
+    #        print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1)
 
     if Options.has_key("CanonicalPath"): upd.can_path=Options["CanonicalPath"]
 
@@ -249,7 +249,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
     if newsizesha1 == oldsizesha1:
         os.unlink(newfile)
         oldf.close()
-        print "%s: unchanged" % (origfile)
+        #print "%s: unchanged" % (origfile)
     else:
         if not os.path.isdir(outdir):
             os.mkdir(outdir)
@@ -367,7 +367,7 @@ def main():
                     maxsuite = maxpackages
                     # Process Contents
                     file = "%s/%s/Contents-%s" % (Cnf["Dir::Root"] + tree, component,
-                            longarch)
+                            architecture)
                     storename = "%s/%s_%s_contents_%s" % (Options["TempDir"], suite, component, architecture)
                     genchanges(Options, file + ".diff", storename, file, \
                       Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents))