pld-builder.new: PLD_Builder/chroot.py Revert descriptor based app...

arekm arekm at pld-linux.org
Sun Feb 25 15:06:15 CET 2007


Author: arekm                        Date: Sun Feb 25 14:06:15 2007 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Revert descriptor based approach. Unfortunately sudo also closes fds.

---- Files affected:
pld-builder.new/PLD_Builder:
   chroot.py (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/chroot.py
diff -u pld-builder.new/PLD_Builder/chroot.py:1.22 pld-builder.new/PLD_Builder/chroot.py:1.23
--- pld-builder.new/PLD_Builder/chroot.py:1.22	Sun Feb 25 14:34:34 2007
+++ pld-builder.new/PLD_Builder/chroot.py	Sun Feb 25 15:06:10 2007
@@ -42,11 +42,11 @@
 def cp(file, outfile, rm=False):
     f = open(outfile, 'w')
     fileno = f.fileno()
-    cmd = "cat %s >&%d" % (file, fileno)
+    cmd = "cat %s" % file
     if rm:
         cmd += "; rm %s" % file
-    c = command_sh(cmd)
-    subprocess.call(c, shell = True, close_fds = False)
+    c = command(cmd, user)
+    subprocess.call(c, shell = True, stdout = f)
     r = f.close()
     if r == None:
         return 0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/chroot.py?r1=1.22&r2=1.23&f=u



More information about the pld-cvs-commit mailing list