[dak/master] generate_index_diffs
replace os.popen2 by strftime usage (someone clearly didnt know that
and preferred to spawn date +%whatever. *sigh*).
also replace a os.popen call with subprocess.Popen.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
dak/generate_index_diffs.py | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 2b4ad69..6104e8a 100755
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -30,7 +30,11 @@
################################################################################
-import sys, os, tempfile
+import sys
+import os
+import tempfile
+import subprocess
+import time
import apt_pkg
from daklib import utils
@@ -257,9 +261,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()
@@ -306,10 +315,7 @@ def main():
if not Options.has_key("PatchName"):
format = "%Y-%m-%d-%H%M.%S"
- i,o = os.popen2("date +%s" % (format))
- i.close()
- Options["PatchName"] = o.readline()[:-1]
- o.close()
+ Options["PatchName"] = time.strftime( format )
AptCnf = apt_pkg.newConfiguration()
apt_pkg.ReadConfigFileISC(AptCnf,utils.which_apt_conf_file())
--
1.5.6.5
Reply to: