X-Git-Url: https://git.tld-linux.org/?p=tld-builder.git;a=blobdiff_plain;f=TLD_Builder%2Fchroot.py;h=6e7976a9e7c6aa8d3124276e659b3d5eeb73b08a;hp=7485e7213add7996c1d4c08f84e7ce0f216d9356;hb=55c3e9258e178d20f8aa86eb171f8617d4857f2f;hpb=bc5e1af0e1a33e54f39a5a93c8aa7aae4ef74cd8 diff --git a/TLD_Builder/chroot.py b/TLD_Builder/chroot.py index 7485e72..6e7976a 100644 --- a/TLD_Builder/chroot.py +++ b/TLD_Builder/chroot.py @@ -24,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