Merge branch 'psycopg2' into content_generation

[dak.git] / dak / generate_index_diffs.py

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 3fe86e112d18d01cc8fafe18a0ee9cd049827840..2b06146b3b1e00aeff6bfaacebe56cbd0932605d 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -254,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=subprocess.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()