summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-03-15 08:08:51 +0000
committerThierry Vignaud <tv@mageia.org>2012-03-15 08:08:51 +0000
commitf416a1c766406fc6372b18b385fd60727acad10b (patch)
tree49d234dd656ff511096f2db5495461da2fb274dd
parent06393d7adde205875cd9c575c5f7226ac9df8fae (diff)
downloadmgatools-f416a1c766406fc6372b18b385fd60727acad10b.tar
mgatools-f416a1c766406fc6372b18b385fd60727acad10b.tar.gz
mgatools-f416a1c766406fc6372b18b385fd60727acad10b.tar.bz2
mgatools-f416a1c766406fc6372b18b385fd60727acad10b.tar.xz
mgatools-f416a1c766406fc6372b18b385fd60727acad10b.zip
simplify
-rw-r--r--pm/MGATools/rpmsrate.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/pm/MGATools/rpmsrate.pm b/pm/MGATools/rpmsrate.pm
index 4f66a2d..73ad976 100644
--- a/pm/MGATools/rpmsrate.pm
+++ b/pm/MGATools/rpmsrate.pm
@@ -90,9 +90,7 @@ sub cleanrpmsrate {
any { $rpm =~ /$_/ } @$norpmsrate and next;
if (/(.*?)([_-]*[\d._]+)(-.*)?-devel$/ || /^$kernel_like(-[^.]+(?:\.[^.]+){3,6}md[vk])$/) {
- if (!$rpms{"$1$3"}) {
- $rpms{"$1$3"} = [ $2, $1, $3 ];
- } elsif (URPM::ranges_overlap("== $2", "> $rpms{'$1$3'}")) {
+ if (!$rpms{"$1$3"} || URPM::ranges_overlap("== $2", "> $rpms{'$1$3'}")) {
$rpms{"$1$3"} = [ $2, $1, $3 ];
}
if (/^$kernel_like-(\d+\.\d+)(.*)/) {