From 6cec89aa55001ddce8c0addd7f7763d35ce2466a Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Tue, 14 Oct 2025 13:28:57 -0400 Subject: [PATCH 1/2] Default the homepage in the packaging metadata if not otherwise declared by the package. --- bloom/generators/debian/generator.py | 6 +++--- bloom/generators/rpm/generator.py | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bloom/generators/debian/generator.py b/bloom/generators/debian/generator.py index c1abe493..9025a43c 100644 --- a/bloom/generators/debian/generator.py +++ b/bloom/generators/debian/generator.py @@ -326,9 +326,9 @@ def generate_substitutions_from_package( data['Description'] = format_description(package.description) # Websites websites = [str(url) for url in package.urls if url.type == 'website'] - homepage = websites[0] if websites else '' - if homepage == '': - warning("No homepage set, defaulting to ''") + homepage = websites[0] if websites else 'https://index.ros.org/p/%s/#%s' % (package, ros_distro) + if not websites: + warning("No homepage set, defaulting to %s" % homepage) data['Homepage'] = homepage repositories = [str(url) for url in package.urls if url.type == 'repository'] repository = repositories[0] if repositories else '' diff --git a/bloom/generators/rpm/generator.py b/bloom/generators/rpm/generator.py index 66c8f3fe..01b10e11 100644 --- a/bloom/generators/rpm/generator.py +++ b/bloom/generators/rpm/generator.py @@ -220,9 +220,10 @@ def generate_substitutions_from_package( data['LicenseFiles'] = sorted(set(l.file for l in package.licenses if l.file)) # Websites websites = [str(url) for url in package.urls if url.type == 'website'] - data['Homepage'] = websites[0] if websites else '' - if data['Homepage'] == '': - warning("No homepage set") + homepage = websites[0] if websites else 'https://index.ros.org/p/%s/#%s' % (package, ros_distro) + if not websites: + warning("No homepage set, defaulting to %s" % homepage) + data['Homepage'] = homepage # RPM Increment Number data['RPMInc'] = rpm_inc # Package name From 7af208002659eec9f8023de508af62e5c6f07019 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 22 Oct 2025 13:24:13 -0400 Subject: [PATCH 2/2] Resolve package name for url Co-authored-by: Martin Pecka --- bloom/generators/debian/generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bloom/generators/debian/generator.py b/bloom/generators/debian/generator.py index 9025a43c..1d33306d 100644 --- a/bloom/generators/debian/generator.py +++ b/bloom/generators/debian/generator.py @@ -326,7 +326,7 @@ def generate_substitutions_from_package( data['Description'] = format_description(package.description) # Websites websites = [str(url) for url in package.urls if url.type == 'website'] - homepage = websites[0] if websites else 'https://index.ros.org/p/%s/#%s' % (package, ros_distro) + homepage = websites[0] if websites else 'https://index.ros.org/p/%s/#%s' % (package.name, ros_distro) if not websites: warning("No homepage set, defaulting to %s" % homepage) data['Homepage'] = homepage