From 7e9a2b871fc48fb01eb2edd74ec79b933b99720e Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Thu, 19 Apr 2018 22:18:37 +0300 Subject: [PATCH] PY-29471 Don't propagate not existing exit code from runpy.run_module() packaging_tool.py is terminated with the right exit code from pip anyway with this approach because pip.__main__ calls sys.exit() itself. --- python/helpers/packaging_tool.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/python/helpers/packaging_tool.py b/python/helpers/packaging_tool.py index 19f7e50448c5..3f9d0a71a48c 100644 --- a/python/helpers/packaging_tool.py +++ b/python/helpers/packaging_tool.py @@ -56,11 +56,11 @@ def do_list(): def do_install(pkgs): - return run_pip(['install'] + pkgs) + run_pip(['install'] + pkgs) def do_uninstall(pkgs): - return run_pip(['uninstall', '-y'] + pkgs) + run_pip(['uninstall', '-y'] + pkgs) def run_pip(args): @@ -143,13 +143,12 @@ def main(): rmdir = mkdtemp_ifneeded() pkgs = sys.argv[2:] - retcode = do_install(pkgs) + do_install(pkgs) if rmdir is not None: import shutil shutil.rmtree(rmdir) - elif cmd == 'untar': if len(sys.argv) < 2: usage() @@ -159,7 +158,7 @@ def main(): if len(sys.argv) < 2: usage() pkgs = sys.argv[2:] - retcode = do_uninstall(pkgs) + do_uninstall(pkgs) elif cmd == 'pyvenv': opts, args = getopt.getopt(sys.argv[2:], '', ['system-site-packages']) if len(args) != 1: