[packages/rpm] - fix perl module version detection for packages defined like 'package foo ver;'
baggins
baggins at pld-linux.org
Sun Jun 12 13:48:45 CEST 2022
commit bffe2e62385500466d034285aab222782c0c8d01
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jun 12 13:48:30 2022 +0200
- fix perl module version detection for packages defined like 'package foo ver;'
perl.prov | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/perl.prov b/perl.prov
index 6a66f76..6e98f9a 100644
--- a/perl.prov
+++ b/perl.prov
@@ -92,13 +92,14 @@ sub process_file {
# search for the package name
if (
- !defined $package
- && ( my ($pack) = m/^\s*(?:\{\s*)?package\s+([_:a-zA-Z0-9]+?):*\s*;/ )
+ (!defined $package || !defined $version)
+ && ( my ($pack, $ver) = m/^\s*(?:\{\s*)?package\s+([_:a-zA-Z0-9]+?)\s*(?:v?([0-9_.]+)\s*)?[;{]/)
&& $1 ne 'main'
&& match_the_path( $file, $1 )
)
{
$package = $pack;
+ $version = $ver;
}
if ( !defined $version && /([\$*])(([\w\:\']*)\bVERSION)\b.*\=/ ) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/bffe2e62385500466d034285aab222782c0c8d01
More information about the pld-cvs-commit
mailing list