From eb6a73ffc7ec588d5cbe6c339ffb5abdce63ac80 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 10 Jun 2014 08:15:40 +0100 Subject: [PATCH] Add --disable-shell-wrap support (to avoid locking through bashrc wrappers) --- bin/bump_kernel_packages | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/bump_kernel_packages b/bin/bump_kernel_packages index e8c58a01..4418b877 100755 --- a/bin/bump_kernel_packages +++ b/bin/bump_kernel_packages @@ -64,6 +64,10 @@ if __name__ == "__main__": "--non-interactive", action="store_true", default=False, help="if set, the script will run in non-interactive mode") + parser.add_argument( + "--disable-shell-wrap", action="store_true", default=False, + help="if set, the script will not source .bashrc") + nsargs = parser.parse_args(sys.argv[1:]) known_multiple_injected_versions = set([ @@ -179,7 +183,9 @@ if __name__ == "__main__": dirs.append(portage_tmpdir) os.environ["PORTAGE_TMPDIR"] = portage_tmpdir - cmd_prefix = "test -e ~/.bashrc && source ~/.bashrc;" + cmd_prefix = "" + if not nsargs.disable_shell_wrap: + cmd_prefix = "test -e ~/.bashrc && source ~/.bashrc;" if normal_atoms and not nsargs.only_injected: args = ["emerge", "-v", "--keep-going"]