fix potential fallback_resolver error

Author: lennonwoo

bloom/generators/common.py

@@ -228,7 +228,7 @@ def resolve_rosdep_key(
                             .format(key), returncode=returncode)
 
 
-def default_fallback_resolver(key, peer_packages):
+def default_fallback_resolver(key, peer_packages, rosdistro):
     BloomGenerator.exit("Failed to resolve rosdep key '{0}', aborting."
                         .format(key), returncode=code.GENERATOR_NO_SUCH_ROSDEP_KEY)
 
@@ -254,7 +254,7 @@ def resolve_dependencies(
         # Do not compare the installer key here since this is a general purpose function
         # They installer is verified in the OS specific generator, when the keys are pre-checked.
         if resolved_key is None:
-            resolved_key = fallback_resolver(key, peer_packages)
+            resolved_key = fallback_resolver(key, peer_packages, ros_distro)
         resolved_keys[key] = resolved_key
     return resolved_keys
 
@@ -984,10 +984,11 @@ def set_releaser_history(self, history):
             if has_changes():
                 execute_command('git commit -m "Store releaser history"')
 
-    def missing_dep_resolver(self, key, peer_packages):
+    @staticmethod
+    def missing_dep_resolver(key, peer_packages, rosdistro):
         if key in peer_packages:
             return [sanitize_package_name(key)]
-        return default_fallback_resolver(key, peer_packages)
+        return default_fallback_resolver(key, peer_packages, rosdistro)
 
     def place_template_files(self, build_type, dir_path=None):
         # Create/Clean the package system folder

bloom/generators/rosdebian.py

@@ -73,10 +73,11 @@ def summarize(self):
         info("Releasing for rosdistro: " + self.rosdistro)
         return ret
 
-    def missing_dep_resolver(self, key, peer_packages):
+    @staticmethod
+    def missing_dep_resolver(key, peer_packages, rosdistro):
         if key in peer_packages:
-            return [sanitize_package_name(rosify_package_name(key, self.rosdistro))]
-        return default_fallback_resolver(key, peer_packages)
+            return [sanitize_package_name(rosify_package_name(key, rosdistro))]
+        return default_fallback_resolver(key, peer_packages, rosdistro)
 
     @staticmethod
     def get_subs_hook(subs, package, rosdistro, releaser_history=None):

bloom/generators/rosrpm.py

@@ -71,10 +71,11 @@ def summarize(self):
         info("Releasing for rosdistro: " + self.rosdistro)
         return ret
 
-    def missing_dep_resolver(self, key, peer_packages):
+    @staticmethod
+    def missing_dep_resolver(self, key, peer_packages, rosdistro):
         if key in peer_packages:
-            return [sanitize_package_name(rosify_package_name(key, self.rosdistro))]
-        return default_fallback_resolver(key, peer_packages)
+            return [sanitize_package_name(rosify_package_name(key, rosdistro))]
+        return default_fallback_resolver(key, peer_packages, rosdistro)
 
     @staticmethod
     def get_subs_hook(subs, package, rosdistro, releaser_history=None):

test/unit_tests/test_generators/test_common/test_generator.py

@@ -10,7 +10,7 @@
 from ....utils.common import temporary_directory
 from ....utils.common import user
 
-from bloom.generators.debian.generator import PackageManagerGenerator
+from bloom.generators.common import PackageManagerGenerator
 
 from bloom.util import code