[dak/master] Hm, i seem to miss a small detail here, lets back out this one hunk and look later. I DO HATE PDIFFS. I DO
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
dak/generate_index_diffs.py | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 3fe86e1..2b06146 100755
--- 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()
--
1.5.6.5
Reply to: