diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-15 13:11:40 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-15 13:11:40 +0000 |
| commit | e90003e7fcf962f4fb17540084c74a8ea4d4cac4 (patch) | |
| tree | 7790acc9548a14d087396485ee87ca1bb607816e | |
| parent | 71faac3c9b8a6471eb6955b9fc614071943322db (diff) | |
| download | mgatools-e90003e7fcf962f4fb17540084c74a8ea4d4cac4.tar mgatools-e90003e7fcf962f4fb17540084c74a8ea4d4cac4.tar.gz mgatools-e90003e7fcf962f4fb17540084c74a8ea4d4cac4.tar.bz2 mgatools-e90003e7fcf962f4fb17540084c74a8ea4d4cac4.tar.xz mgatools-e90003e7fcf962f4fb17540084c74a8ea4d4cac4.zip | |
(cleanrpmsrate) looks for mga extension, not mdv (broken since mga fork)
| -rw-r--r-- | pm/MGATools/rpmsrate.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pm/MGATools/rpmsrate.pm b/pm/MGATools/rpmsrate.pm index 64d67ed..32b4258 100644 --- a/pm/MGATools/rpmsrate.pm +++ b/pm/MGATools/rpmsrate.pm @@ -116,7 +116,7 @@ sub cleanrpmsrate { my (%rpms, $text, %rate, %section, %keyword, %locale, %localized_pkg); my @plain_flags = qw(INSTALL LIVE); my $kernel_like = "((?:(?:NVIDIA_)?kernel|NVIDIA_nforce|cm2020).*)"; - my $dkms_like = "(.*)([-_])kernel-([0-9]+(?:\.[0-9]+){2,3}-[0-9]+(?:.[^.]+){0,2}md[vk])(.*)"; + my $dkms_like = "(.*)([-_])kernel-([0-9]+(?:\.[0-9]+){2,3}-[0-9]+(?:.[^.]+){0,2}\.?mga\d+)(.*)"; my $rpmsrate_dkms_like = "(.*[-_]kernel)(.*)"; my $urpm2 = URPM->new; @@ -127,7 +127,7 @@ sub cleanrpmsrate { s/-[^-]+-[^-]+\.[^.]+$// or next; any { $rpm =~ /$_/ } @$norpmsrate and next; - if (/(.*?)([_-]*[\d._]+)(-.*)?-devel$/ || /^$kernel_like(-[^.]+(?:\.[^.]+){3,6}md[vk])$/) { + if (/(.*?)([_-]*[\d._]+)(-.*)?-devel$/ || /^$kernel_like(-[^.]+(?:\.[^.]+){3,6}\.?mga\d+)$/) { if (!$rpms{"$1$3"} || URPM::ranges_overlap("== $2", "> $rpms{'$1$3'}")) { $rpms{"$1$3"} = [ $2, $1, $3 ]; } |