From 2449c9920cc94aebbbb37b430f8a85c88b0ba23c Mon Sep 17 00:00:00 2001 From: lennonwoo Date: Fri, 28 Jun 2019 14:25:07 +0800 Subject: [PATCH] fix too few arguments passed in get_subs_hook This commit add missing rosdistro argument when call super's get_subs_hook it could be error when we generate RPM package, since rpm will deal with release_history in get_subs_hook. Also change the combine format string logic to one line since it is not longer than 120. --- bloom/generators/rosdebian.py | 6 ++---- bloom/generators/rosrpm.py | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/bloom/generators/rosdebian.py b/bloom/generators/rosdebian.py index 6785d4e5..561cee5d 100644 --- a/bloom/generators/rosdebian.py +++ b/bloom/generators/rosdebian.py @@ -37,7 +37,6 @@ from bloom.generators.common import generate_substitutions_from_package from bloom.generators.common import sanitize_package_name - from bloom.generators.debian import DebianGenerator from bloom.generators.debian import format_description from bloom.generators.debian import format_depends @@ -81,7 +80,7 @@ def missing_dep_resolver(key, peer_packages, rosdistro): @staticmethod def get_subs_hook(subs, package, rosdistro, releaser_history=None): - subs = DebianGenerator.get_subs_hook(subs, package, releaser_history) + subs = DebianGenerator.get_subs_hook(subs, package, rosdistro, releaser_history=releaser_history) subs['Package'] = rosify_package_name(subs['Package'], rosdistro) # ROS 2 specific bloom extensions. @@ -127,8 +126,7 @@ def generate_branching_arguments(self, package, branch): return args def get_release_tag(self, data): - return 'release/{0}/{1}/{2}-{3}'\ - .format(self.rosdistro, data['Name'], data['Version'], self.inc) + return 'release/{0}/{1}/{2}-{3}'.format(self.rosdistro, data['Name'], data['Version'], self.inc) def rosify_package_name(name, rosdistro): diff --git a/bloom/generators/rosrpm.py b/bloom/generators/rosrpm.py index ae0d42a8..414a0955 100644 --- a/bloom/generators/rosrpm.py +++ b/bloom/generators/rosrpm.py @@ -72,14 +72,14 @@ def summarize(self): return ret @staticmethod - def missing_dep_resolver(self, key, peer_packages, rosdistro): + def missing_dep_resolver(key, peer_packages, rosdistro): if key in 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): - subs = RpmGenerator.get_subs_hook(subs, package, releaser_history) + subs = RpmGenerator.get_subs_hook(subs, package, rosdistro, releaser_history=releaser_history) subs['Package'] = rosify_package_name(subs['Package'], rosdistro) return subs @@ -93,8 +93,7 @@ def generate_branching_arguments(self, package, branch): return args def get_release_tag(self, data): - return 'release/{0}/{1}/{2}-{3}'\ - .format(self.rosdistro, data['Name'], data['Version'], self.rpm_inc) + return 'release/{0}/{1}/{2}-{3}'.format(self.rosdistro, data['Name'], data['Version'], self.inc) def rosify_package_name(name, rosdistro):