From 77a891114b8878c8c193822f746a2579ccc0fa63 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 16 Aug 2024 17:49:47 +0900 Subject: [PATCH] add --skip-pip option to generators/debian/generate_cmd.py, for bloom-generate rosdebian --- bloom/generators/debian/generate_cmd.py | 3 +++ bloom/generators/rpm/generate_cmd.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/bloom/generators/debian/generate_cmd.py b/bloom/generators/debian/generate_cmd.py index 19d036d3..1b26b9ca 100644 --- a/bloom/generators/debian/generate_cmd.py +++ b/bloom/generators/debian/generate_cmd.py @@ -67,6 +67,7 @@ def prepare_arguments(parser): help="path to or containing the package.xml of a package") action = parser.add_mutually_exclusive_group(required=False) add = action.add_argument + add('--skip-pip', default=False, action='store_true', help="skip all pip rosdep keys") add('--place-template-files', action='store_true', help="places debian/* template files only") add('--process-template-files', action='store_true', @@ -107,6 +108,8 @@ def main(args=None, get_subs_fn=None): os_data = create_default_installer_context().get_os_name_and_version() os_name, os_version = os_data ros_distro = os.environ.get('ROS_DISTRO', 'indigo') + if args.skip_pip: + os.environ['BLOOM_SKIP_PIP'] = '1' # Allow args overrides os_name = args.os_name or os_name diff --git a/bloom/generators/rpm/generate_cmd.py b/bloom/generators/rpm/generate_cmd.py index b219d4c3..30cdd029 100644 --- a/bloom/generators/rpm/generate_cmd.py +++ b/bloom/generators/rpm/generate_cmd.py @@ -67,6 +67,7 @@ def prepare_arguments(parser): help="path to or containing the package.xml of a package") action = parser.add_mutually_exclusive_group(required=False) add = action.add_argument + add('--skip-pip', default=False, action='store_true', help="skip all pip rosdep keys") add('--place-template-files', action='store_true', help="places rpm/* template file(s) only") add('--process-template-files', action='store_true', @@ -107,6 +108,8 @@ def main(args=None, get_subs_fn=None): os_data = create_default_installer_context().get_os_name_and_version() os_name, os_version = os_data ros_distro = os.environ.get('ROS_DISTRO', 'indigo') + if args.skip_pip: + os.environ['BLOOM_SKIP_PIP'] = '1' # Allow args overrides os_name = args.os_name or os_name