]> git.pld-linux.org Git - projects/pld-builder.new.git/commitdiff
Better way of forcing /dev/null as stdin.
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Sat, 17 Apr 2010 20:44:42 +0000 (20:44 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    PLD_Builder/chroot.py -> 1.38

PLD_Builder/chroot.py

index b5e96b5f76f2ff51264dbd98a1a8c7b9070c84b6..92354d3568ff5d5bac6bd6b22998efd141cb0d56 100644 (file)
@@ -18,12 +18,12 @@ def command(cmd, user = None, nostdin=""):
     if user == None:
         user = config.builder_user
     if nostdin:
-        nostdin = "< /dev/null"
+        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, quote(cmd), nostdin)
+            % (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"):
This page took 0.195072 seconds and 4 git commands to generate.