X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=5cac5ccd11b87efd0f5cffb0d40703d7552d1103;hb=5dd1abb51a109c976351ebd6ecd5018e26ee4dc0;hp=4222c0cf4fb9446b0bc19a7127dab4e9fe4da24e;hpb=19e99ee6a161707062fd7ac5ea5ac4781a28d0bc;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index 4222c0cf..5cac5ccd 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -254,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() @@ -352,14 +352,6 @@ def main(): for archobj in architectures: architecture = archobj.arch_string - if architecture != "source": - # Process Contents - file = "%s/Contents-%s" % (Cnf["Dir::Root"] + tree, - architecture) - storename = "%s/%s_contents_%s" % (Options["TempDir"], suite, architecture) - genchanges(Options, file + ".diff", storename, file, \ - Cnf.get("Suite::%s::Generate-Index-Diffs::MaxDiffs::Contents" % (suite), maxcontents)) - # use sections instead of components since dak.conf # treats "foo/bar main" as suite "foo", suitesuffix "bar" and # component "bar/main". suck. @@ -373,6 +365,12 @@ def main(): longarch = "binary-%s"% (architecture) packages = "Packages" maxsuite = maxpackages + # Process Contents + file = "%s/%s/Contents-%s" % (Cnf["Dir::Root"] + tree, component, + 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)) file = "%s/%s/%s/%s" % (Cnf["Dir::Root"] + tree, component, longarch, packages)