Author: arekm Date: Sun Apr 18 05:37:11 2010 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
- back to old way since new doesn't work
---- Files affected:
pld-builder.new/PLD_Builder:
chroot.py (1.39 -> 1.40)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/chroot.py
diff -u pld-builder.new/PLD_Builder/chroot.py:1.39
pld-builder.new/PLD_Builder/chroot.py:1.40
--- pld-builder.new/PLD_Builder/chroot.py:1.39 Sat Apr 17 23:21:53 2010
+++ pld-builder.new/PLD_Builder/chroot.py Sun Apr 18 07:37:05 2010
@@ -18,12 +18,12 @@
if user == None:
user = config.builder_user
if nostdin:
- nostdin = "< /dev/null; "
- return "%s sudo chroot %s su - %s -c \"export LC_ALL=C; %s %s\" %s" \
- % (config.sudo_chroot_wrapper, config.chroot, user, quote(cmd),
nostdin)
+ nostdin = "exec < /dev/null; "
+ return "%s sudo chroot %s su - %s -c \"export LC_ALL=C; %s %s\"" \
+ % (config.sudo_chroot_wrapper, config.chroot, user, nostdin,
quote(cmd))
def command_sh(cmd):
- return "%s sudo chroot %s /bin/sh -c \"export LC_ALL=C; %s\" < /dev/null" \
+ return "%s sudo chroot %s /bin/sh -c \"export LC_ALL=C; exec < /dev/null;
%s\"" \
% (config.sudo_chroot_wrapper, config.chroot, quote(cmd))
def popen(cmd, user = "builder", mode = "r"):
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/chroot.py?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
