- fix byte/str for chroot.popen

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

diff --git a/TLD_Builder/chroot.py b/TLD_Builder/chroot.py
index 3e427b9a38436f88137f4f580a7a7d9e09192e1e..6e7976a9e7c6aa8d3124276e659b3d5eeb73b08a 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 shutil
 import subprocess
 
 from config import config
@@ -23,12 +24,12 @@ def command_sh(cmd):
     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"):
+def popen(cmd, user = "builder", mode = "r", encoding = None):
     if mode == "r":
-        p = subprocess.Popen(command(cmd, user), shell=True, stdout=subprocess.PIPE, close_fds=True)
+        p = subprocess.Popen(command(cmd, user), shell=True, stdout=subprocess.PIPE, close_fds=True, encoding=encoding)
         f = p.stdout
     else:
-        p = subprocess.Popen(command(cmd, user), shell=True, stdin=subprocess.PIPE, close_fds=True)
+        p = subprocess.Popen(command(cmd, user), shell=True, stdin=subprocess.PIPE, close_fds=True, encoding=encoding)
         f = p.stdin
     return f