commit: 60f3c871f6320e3b637d61f319c5960824567c82
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Dec 16 00:17:10 2014 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Dec 16 00:17:10 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=60f3c871
run non-user hooks with /dev/null as stdin
---
roverlay/tools/shenv.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/roverlay/tools/shenv.py b/roverlay/tools/shenv.py
index 8f2cea2..5670354 100644
--- a/roverlay/tools/shenv.py
+++ b/roverlay/tools/shenv.py
@@ -29,6 +29,8 @@ LOGGER = logging.getLogger ( 'shenv' )
NULL_PHASE = 'null'
+SHENV_PHASES_WITH_STDIN = frozenset ({ 'user', })
+
SHENV_VARS_TO_KEEP = frozenset ({
( 'PATH', '/usr/local/bin:/usr/bin:/bin' ),
'PWD',
@@ -348,7 +350,7 @@ def run_script_exec (
def run_script (
script, phase, argv=(), return_success=False, logger=None,
- log_output=True, initial_dir=None, allow_stdin=True
+ log_output=True, initial_dir=None
):
# global _SHELL_INTPR
# if _SHELL_INTPR is None:
@@ -360,7 +362,11 @@ def run_script (
script_call, output = _run_subprocess (
# ( _SHELL_INTPR, script, ),
( script, ) + argv,
- stdin = None if allow_stdin else False,
+ stdin = (
+ None if (
+ my_env ['ROVERLAY_PHASE'] in SHENV_PHASES_WITH_STDIN
+ ) else False
+ ),
stdout = subprocess.PIPE if log_output else None,
stderr = subprocess.PIPE if log_output else None,
cwd = my_env ['S'] if initial_dir is None else initial_dir,
