michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle version comparisons like 7xx vs 12yy

Browse Source
This commit is contained in:
Jamie Cameron
2010-01-03 15:12:08 -08:00
parent de3453d0d9
commit ea502385ef
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
software/software-lib.pl
View File

@@ -208,9 +208,31 @@ for(my $i=0; $i<@sp1 || $i<@sp2; $i++) {
local $v2 = $sp2[$i];
local $comp;
if ($v1 =~ /^\d+$/ && $v2 =~ /^\d+$/) {
# Full numeric compare
$comp = $v1 <=> $v2;
}
elsif ($v1 =~ /^\d+\S*$/ && $v2 =~ /^\d+\S*$/) {
# Numeric followed by string
$v1 =~ /^(\d+)(\S*)$/;
local ($v1n, $v1s) = ($1, $2);
$v2 =~ /^(\d+)(\S*)$/;
local ($v2n, $v2s) = ($1, $2);
$comp = $v1n <=> $v2n;
if (!$comp) {
# X.rcN is always older than X
if ($v1s =~ /^rc\d+$/i && $v2s =~ /^\d*$/) {
$comp = -1;
}
elsif ($v1s =~ /^\d*$/ && $v2s =~ /^rc\d+$/i) {
$comp = 1;
}
else {
$comp = $v1s cmp $v2s;
}
}
}
else {
# String compare only
$comp = $v1 cmp $v2;
}
return $comp if ($comp);