From 7d6365b4732fe7ca6ab2c6395189818a9411d9df Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 2 Jun 2017 21:33:29 +0200 Subject: [PATCH] Revert "Fixed menuconfig with new async runner" I did not test this well enough, sorry! This introduced problems such as interactive shell not working anymore (#40), cryptsetup partion creating not working anymore etc. This reverts commit f39c1dae69f7e580b096755729147932b44ba3d7. --- pmb/build/menuconfig.py | 2 +- pmb/chroot/root.py | 4 ++-- pmb/chroot/user.py | 4 ++-- pmb/helpers/run.py | 22 +++++++++------------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/pmb/build/menuconfig.py b/pmb/build/menuconfig.py index 49221975..b5e63d29 100644 --- a/pmb/build/menuconfig.py +++ b/pmb/build/menuconfig.py @@ -55,7 +55,7 @@ def menuconfig(args, pkgname, arch): cmd += [key + "=" + value] cmd += ["abuild", "-d", "menuconfig"] logging.info("(native) run menuconfig") - pmb.chroot.user(args, cmd, "native", "/home/user/build", log=False, passthrough=True) + pmb.chroot.user(args, cmd, "native", "/home/user/build", log=False) # Update config + checksums logging.info("copy kernel config back to aport-folder") diff --git a/pmb/chroot/root.py b/pmb/chroot/root.py index 12e6900b..dbf8b9c6 100644 --- a/pmb/chroot/root.py +++ b/pmb/chroot/root.py @@ -41,7 +41,7 @@ def executables_absolute_path(): def root(args, cmd, suffix="native", working_dir="/", log=True, - auto_init=True, return_stdout=False, check=True, passthrough=False): + auto_init=True, return_stdout=False, check=True): """ Run a command inside a chroot as root. @@ -82,4 +82,4 @@ def root(args, cmd, suffix="native", working_dir="/", log=True, # Run the command return pmb.helpers.run.core(args, cmd_full, log_message, log, - return_stdout, check, passthrough) + return_stdout, check) diff --git a/pmb/chroot/user.py b/pmb/chroot/user.py index 7b03ad7b..edf8d907 100644 --- a/pmb/chroot/user.py +++ b/pmb/chroot/user.py @@ -20,7 +20,7 @@ import pmb.chroot.root def user(args, cmd, suffix="native", working_dir="/", log=True, - auto_init=True, return_stdout=False, check=True, passthrough=False): + auto_init=True, return_stdout=False, check=True): """ Run a command inside a chroot as "user" @@ -29,4 +29,4 @@ def user(args, cmd, suffix="native", working_dir="/", log=True, """ cmd = ["su", "user", "-c", " ".join(cmd)] return pmb.chroot.root(args, cmd, suffix, working_dir, log, - auto_init, return_stdout, check, passthrough) + auto_init, return_stdout, check) diff --git a/pmb/helpers/run.py b/pmb/helpers/run.py index cd2b8a79..5f18aa23 100644 --- a/pmb/helpers/run.py +++ b/pmb/helpers/run.py @@ -19,7 +19,6 @@ along with pmbootstrap. If not, see . import logging import asyncio import locale -import subprocess @asyncio.coroutine @@ -78,7 +77,7 @@ def _execute(loop, args, cmd, log_message, log, return_stdout, check=True): return return_code -def core(args, cmd, log_message, log, return_stdout, check=True, passthrough=False): +def core(args, cmd, log_message, log, return_stdout, check=True): logging.debug(log_message) """ Run the command and write the output to the log. @@ -87,18 +86,15 @@ def core(args, cmd, log_message, log, return_stdout, check=True, passthrough=Fal :param log: send output to log instead of stdout :param return_stdout: return the stdout from the called process """ - if passthrough: - result = subprocess.check_call(cmd) - else: - loop = asyncio.get_event_loop() - loop.set_debug(False) - task = _execute(loop, args, cmd, log_message, log, return_stdout, check) - result = loop.run_until_complete(task) + loop = asyncio.get_event_loop() + loop.set_debug(False) + task = _execute(loop, args, cmd, log_message, log, return_stdout, check) + result = loop.run_until_complete(task) return result def user(args, cmd, log=True, working_dir=None, return_stdout=False, - check=True, passthrough=False): + check=True): """ :param working_dir: defaults to args.work """ @@ -106,13 +102,13 @@ def user(args, cmd, log=True, working_dir=None, return_stdout=False, working_dir = args.work # TODO: maintain and check against a whitelist - return core(args, cmd, "% " + " ".join(cmd), log, return_stdout, check, passthrough) + return core(args, cmd, "% " + " ".join(cmd), log, return_stdout, check) def root(args, cmd, log=True, working_dir=None, return_stdout=False, - check=True, passthrough=False): + check=True): """ :param working_dir: defaults to args.work """ cmd = ["sudo"] + cmd - return user(args, cmd, log, working_dir, return_stdout, check, passthrough) + return user(args, cmd, log, working_dir, return_stdout, check)