Skip to content

Fix DEB relationship field #2080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix DEB relationship field #2080

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d44c461
Fix relationship field
coleplx Oct 21, 2024
efd25b1
fix relationship field values
coleplx Oct 21, 2024
1964df8
Removed invalid symbol from RELATIONSHIP_FIELD_PATTERN
coleplx Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/fpm/package/deb.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class FPM::Package::Deb < FPM::Package
(?:-[A-Za-z0-9+~.]+)? # debian_revision
/x # Version field pattern
RELATIONSHIP_FIELD_PATTERN = /^
(?<name>[A-z0-9][A-z0-9_.-]+)
(?<name>[A-z0-9][A-z0-9+.-]+)
(?:\s*\((?<relation>[<>=]+)\s(?<version>#{VERSION_FIELD_PATTERN})\))?
$/x # Relationship field pattern

Expand Down Expand Up @@ -733,7 +733,7 @@ def converted_from(origin)
else
# Also replace '::' in the perl module name with '-'
modulename = m["name"].gsub("::", "-")

# Fix any upper-casing or other naming concerns Debian has about packages
name = "#{attributes[:cpan_package_name_prefix]}-#{modulename}"

Expand Down