pld-builder.new: PLD_Builder/chroot.py Vars renamed.
arekm
arekm at pld-linux.org
Sun Feb 25 15:52:20 CET 2007
Author: arekm Date: Sun Feb 25 14:52:20 2007 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
Vars renamed.
---- Files affected:
pld-builder.new/PLD_Builder:
chroot.py (1.25 -> 1.26)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/chroot.py
diff -u pld-builder.new/PLD_Builder/chroot.py:1.25 pld-builder.new/PLD_Builder/chroot.py:1.26
--- pld-builder.new/PLD_Builder/chroot.py:1.25 Sun Feb 25 15:48:12 2007
+++ pld-builder.new/PLD_Builder/chroot.py Sun Feb 25 15:52:15 2007
@@ -54,23 +54,24 @@
if rm:
cmd += "; rm %s" % file
c = command(cmd, user)
- f = os.popen(c)
+ p = os.popen(c)
# get file contents
marker = False
for l in p:
if not marker and l.strip() == marker_start:
marker = True
continue
- p = l.strip().find(marker_end)
- if p != -1:
- l = l[:p]
+ me = l.strip().find(marker_end)
+ if me != -1:
+ l = l[:me]
f.write(l)
marker = False
break
if marker:
f.write(l)
- r = f.close()
- if r == None:
+ rp = p.close()
+ rf = f.close()
+ if rp == None:
return 0
else:
return r
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/chroot.py?r1=1.25&r2=1.26&f=u
More information about the pld-cvs-commit
mailing list