X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=3297c42cfebf23729b524df67f75f0965c7e280b;hb=f7e8ab5cc1ef088763a6e0f2b0cdba9ec2b63c87;hp=5cac5ccd11b87efd0f5cffb0d40703d7552d1103;hpb=5dd1abb51a109c976351ebd6ecd5018e26ee4dc0;p=dak.git diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py index 5cac5ccd..3297c42c 100755 --- a/dak/generate_index_diffs.py +++ b/dak/generate_index_diffs.py @@ -81,7 +81,7 @@ def smartlink(f, t): os.system("bzip2 -d < %s.bz2 > %s" % (f, t)) else: print "missing: %s" % (f) - raise IOError, f + raise IOError(f) def smartopen(file): if os.path.isfile(file): @@ -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) @@ -280,7 +280,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14): def main(): global Cnf, Options, Logger - os.umask(0002) + os.umask(0o002) Cnf = utils.get_conf() Arguments = [ ('h', "help", "Generate-Index-Diffs::Options::Help"),