X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=2b06146b3b1e00aeff6bfaacebe56cbd0932605d;hb=0fbf46fb7da5309d9fca4761178c1375cb8916ee;hp=6104e8a49ea892b885446ffc9acb83956b729e9b;hpb=dc577433a9a2c4a030f0ea913cd01c04397d187e;p=dak.git

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 6104e8a4..2b06146b 100755
--- 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'
@@ -237,17 +238,6 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         if upd.filesizesha1 != oldsizesha1:
             print "info: old file " + oldfile + " 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
-
     if Options.has_key("CanonicalPath"): upd.can_path=Options["CanonicalPath"]
 
     if os.path.exists(newfile): os.unlink(newfile)
@@ -264,11 +254,8 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         if not os.path.isdir(outdir):
             os.mkdir(outdir)
 
-        cmd = "diff --ed - %s | gzip -c -9 > %s.gz" % (newfile, difffile)
-        # Do we need shell=True?
-        w = subprocess.Popen(cmd, shell=True, stdin=PIPE).stdin
-
-        # I bet subprocess can do that better than this, but lets do little steps
+        w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" %
+                     (newfile, difffile), "w")
         pipe_file(oldf, w)
         oldf.close()