Add --skip-keys argument to the RPM generator (#602)

Author: cottsay

bloom/generators/rosrpm.py

@@ -85,7 +85,8 @@ def fallback_resolver(key, peer_packages, rosdistro=self.rosdistro):
             self.rpm_inc,
             [p.name for p in self.packages.values()],
             releaser_history=releaser_history,
-            fallback_resolver=fallback_resolver
+            fallback_resolver=fallback_resolver,
+            skip_keys=self.skip_keys
         )
         subs['Package'] = rosify_package_name(subs['Package'], self.rosdistro)
 

bloom/generators/rpm/generator.py

@@ -208,9 +208,11 @@ def generate_substitutions_from_package(
     rpm_inc=0,
     peer_packages=None,
     releaser_history=None,
-    fallback_resolver=None
+    fallback_resolver=None,
+    skip_keys=None
 ):
     peer_packages = peer_packages or []
+    skip_keys = skip_keys or set()
     data = {}
     # Name, Version, Description
     data['Name'] = package.name
@@ -235,10 +237,10 @@ def generate_substitutions_from_package(
     evaluate_package_conditions(package, ros_distro)
     depends = [
         dep for dep in (package.run_depends + package.buildtool_export_depends)
-        if dep.evaluated_condition is not False]
+        if dep.evaluated_condition is not False and dep.name not in skip_keys]
     build_depends = [
         dep for dep in (package.build_depends + package.buildtool_depends + package.test_depends)
-        if dep.evaluated_condition is not False]
+        if dep.evaluated_condition is not False and dep.name not in skip_keys]
     replaces = [
         dep for dep in package.replaces
         if dep.evaluated_condition is not False]
@@ -471,12 +473,16 @@ def prepare_arguments(self, parser):
             help="overrides the default installation prefix (/usr)")
         add('--os-name', default='fedora',
             help="overrides os_name, set to 'fedora' by default")
+        add('--skip-keys', nargs='+', required=False, default=[],
+            help="dependency keys which should be skipped and"
+                 " discluded from the RPM dependencies")
 
     def handle_arguments(self, args):
         self.interactive = args.interactive
         self.rpm_inc = args.rpm_inc
         self.os_name = args.os_name
         self.distros = args.distros
+        self.skip_keys = args.skip_keys or set()
         if self.distros in [None, []]:
             index = rosdistro.get_index(rosdistro.get_index_url())
             distribution_file = rosdistro.get_distribution_file(index, self.rosdistro)
@@ -549,6 +555,14 @@ def _check_all_keys_are_valid(self, peer_packages, rosdistro):
             for key in keys:
                 key_to_packages_which_depends_on[key].append(package.name)
 
+        for skip_key in self.skip_keys:
+            try:
+                keys_to_resolve.remove(skip_key)
+            except ValueError:
+                warning("Key '{0}' specified by --skip-keys was not found".format(skip_key))
+            else:
+                warning("Skipping dependency key '{0}' per --skip-keys".format(skip_key))
+
         os_name = self.os_name
         rosdistro = self.rosdistro
         all_keys_valid = True
@@ -760,7 +774,8 @@ def get_subs(self, package, rpm_distro, releaser_history=None):
             self.rpm_inc,
             [p.name for p in self.packages.values()],
             releaser_history=releaser_history,
-            fallback_resolver=missing_dep_resolver
+            fallback_resolver=missing_dep_resolver,
+            skip_keys=self.skip_keys
         )
 
     def generate_rpm(self, package, rpm_distro, rpm_dir='rpm'):