michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix version comparison between two packages with minor release numbers http://virtualmin.com/node/35291

Browse Source
This commit is contained in:
Jamie Cameron
2014-11-18 22:29:06 -08:00
parent cdccfa120c
commit 37f9bf9610
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
software/software-lib.pl
View File

@@ -8,7 +8,7 @@ $heiropen_file = "$module_config_directory/heiropen";
# Use the appropriate function set for whatever package management system
# we are using.
do "$config{package_system}-lib.pl";
do "$config{'package_system'}-lib.pl";
if ($config{'update_system'} eq '*') {
# User specifically doesn't want any
@@ -209,6 +209,15 @@ return undef;
# Returns -1 if ver1 is older than ver2, 1 if newer, 0 if same
sub compare_versions
{
local ($ver1, $rel1) = split(/-/, $_[0], 2);
local ($ver2, $rel2) = split(/-/, $_[1], 2);
if ($rel1 ne "" && $rel2 ne "" && $config{'package_system'} eq 'rpm') {
# If two RPM packages have releases, then the version part comparison
# must be done first and separately so that release number parts don't
# override version parts.
return &compare_versions($ver1, $ver2) ||
&compare_versions($rel1, $rel2);
}
local @sp1 = split(/[\.\-\+\~]/, $_[0]);
local @sp2 = split(/[\.\-\+\~]/, $_[1]);
for(my $i=0; $i<@sp1 || $i<@sp2; $i++) {
@@ -239,8 +248,8 @@ for(my $i=0; $i<@sp1 || $i<@sp2; $i++) {
}
}
}
elsif ($v1 =~ /^([^0-9]+)(\d+)$/ && $v2 !~ /^([^0-9]+)(\d+)$/ &&
$1 ne $2) {
elsif ($v1 =~ /^([^0-9]+)(\d+)$/ && $v2 =~ /^([^0-9]+)(\d+)$/ &&
$1 eq $2) {
# Strings that are the same followed by numeric
$comp = $v1 <=> $v2;
}