Merge commit 'ftpmaster/master' into psycopg2

[dak.git] / dak / generate_index_diffs.py

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index a58abdc55c1204dfd57890cd3b48aac815baf061..f3f7a4a16bfec70f48db0b62268519c36031c6e1 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -30,9 +30,12 @@
 
 ################################################################################
 
-import sys, os, tempfile
+import sys
+import os
+import tempfile
+import subprocess
+import time
 import apt_pkg
-import bz2, gzip, time
 from daklib import utils
 
 ################################################################################
@@ -83,9 +86,9 @@ def smartopen(file):
     if os.path.isfile(file):
         f = open(file, "r")
     elif os.path.isfile("%s.gz" % file):
-        f = decompressors[ 'zcat' ]( file )
+        f = create_temp_file(os.popen("zcat %s.gz" % file, "r"))
     elif os.path.isfile("%s.bz2" % file):
-        f = decompressors[ 'bzcat' ]( file )
+        f = create_temp_file(os.popen("bzcat %s.bz2" % file, "r"))
     else:
         f = None
     return f
@@ -174,8 +177,17 @@ class Updates:
         for h in l:
             out.write(" %s %7d %s\n" % (hs[h][1][0], hs[h][1][1], h))
 
-decompressors = { 'zcat' : gzip.GzipFile,
-                  'bzip2' : bz2.BZ2File }
+def create_temp_file(r):
+    f = tempfile.TemporaryFile()
+    while 1:
+        x = r.readline()
+        if not x: break
+        f.write(x)
+    r.close()
+    del x,r
+    f.flush()
+    f.seek(0)
+    return f
 
 def sizesha1(f):
     size = os.fstat(f.fileno())[6]
@@ -223,18 +235,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
 
     if upd.filesizesha1:
         if upd.filesizesha1 != oldsizesha1:
-            print "warning: old file seems to have 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
+            print "info: old file " + oldfile + " changed! %s %s => %s %s" % (upd.filesizesha1 + oldsizesha1)
 
     if Options.has_key("CanonicalPath"): upd.can_path=Options["CanonicalPath"]
 
@@ -249,9 +250,14 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         oldf.close()
         print "%s: unchanged" % (origfile)
     else:
-        if not os.path.isdir(outdir): os.mkdir(outdir)
-        w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" %
-                         (newfile, difffile), "w")
+        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
         pipe_file(oldf, w)
         oldf.close()