aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2020-01-17 16:48:41 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2020-01-17 17:54:37 +0100
commita222687b1d4efa428654d5b6fd72fcb8fe1bf943 (patch)
treec504152a4ab64414df99970a881278ade56fc6df
parentb8c2215c07b4b9fcb7abbcaeda3dd232414dc523 (diff)
downloadperl-URPM-a222687b1d4efa428654d5b6fd72fcb8fe1bf943.tar
perl-URPM-a222687b1d4efa428654d5b6fd72fcb8fe1bf943.tar.gz
perl-URPM-a222687b1d4efa428654d5b6fd72fcb8fe1bf943.tar.bz2
perl-URPM-a222687b1d4efa428654d5b6fd72fcb8fe1bf943.tar.xz
perl-URPM-a222687b1d4efa428654d5b6fd72fcb8fe1bf943.zip
fix a test on Fedora where perl main package is perl-interpreter
-rw-r--r--NEWS1
-rw-r--r--t/rpmdb.t5
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ac178f4..89ff853 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
- CPAN testers:
o display rpm version in flags
o fix indexation (RT#127881)
+ o fix a test on Fedora where perl main package is perl-interpreter
o workaround CPAN testers that run FreeBSD (RT#131162)
o Workaround CPAN testers that run CentOS 7 (RT#131163)
diff --git a/t/rpmdb.t b/t/rpmdb.t
index fd4db8f..6587f7d 100644
--- a/t/rpmdb.t
+++ b/t/rpmdb.t
@@ -25,10 +25,11 @@ my ($pkg_perl, $count_perl, $pkg_perl_extern);
#- arch is void for -pubkey- package.
my $fullname = "$name-$version-$release";
push @all_pkgs, $fullname;
- if ($name eq 'perl') { $pkg_perl_extern = $fullname }
+ $pkg_perl_extern = $fullname if $name eq 'perl' || $name eq 'perl-interpreter';
});
- $count_perl = $db->traverse_tag('name', ['perl'], sub {
+ my $perl = -e "/etc/redhat-release" ? qx(rpm -qf /bin/perl --qf '%{name}') : 'perl';
+ $count_perl = $db->traverse_tag('name', [$perl], sub {
my ($pkg) = @_;
my ($name, $version, $release) = $pkg->fullname;
$pkg_perl = "$name-$version-$release";