- import subprocess

[tld-builder.git] / TLD_Builder / chroot.py

diff --git a/TLD_Builder/chroot.py b/TLD_Builder/chroot.py
index 8acd58d10abd628384e8b39960ec30cca3dcf031..de2459891ee81b227019d1c505c2d5892bbdddc9 100644 (file)
--- a/TLD_Builder/chroot.py
+++ b/TLD_Builder/chroot.py
@@ -4,6 +4,7 @@ import os
 import re
 import random
 import util
+import subprocess
 
 try:
     from hashlib import md5 as md5
@@ -28,7 +29,12 @@ def command_sh(cmd):
             % (config.sudo_chroot_wrapper, config.chroot, quote(cmd))
 
 def popen(cmd, user = "builder", mode = "r"):
-    f = os.popen(command(cmd, user), mode)
+    if mode == "r":
+        p = subprocess.Popen(command(cmd, user), shell=True, stdout=subprocess.PIPE, close_fds=True)
+        f = p.stdout
+    else:
+        p = subprocess.Popen(command(cmd, user), shell=True, stdin=subprocess.PIPE, close_fds=True)
+        f = p.stdin
     return f
 
 def run(cmd, user = "builder", logfile = None, logstdout = None):