arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug 3919 : sync from master

Browse Source
This commit is contained in:
xq2005 2013-12-03 06:39:02 -08:00
parent 64a9d71a53
commit 2f3e76593e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
perl-xCAT/xCAT/Utils.pm
View File

@ -6565,8 +6565,8 @@ sub version_cmp {
$ver_a = shift;
}
my $ver_b = shift;
my @array_a = ($ver_a =~ /([-.]|\d|[^-.\d])/g);
my @array_b = ($ver_b =~ /([-.]|\d|[^-.\d])/g);
my @array_a = ($ver_a =~ /([-.]|\d+|[^-.\d])/g);
my @array_b = ($ver_b =~ /([-.]|\d+|[^-.\d])/g);
my ($a, $b);
my $len_a = @array_a;
@ -6575,7 +6575,7 @@ sub version_cmp {
if ( $len_b < $len_a ) {
$len = $len_b;
}
for ( my $i = 0; $i < $len; $i ) {
for ( my $i = 0; $i < $len; $i++ ) {
$a = $array_a[$i];
$b = $array_b[$i];
if ($a eq $b) {
@ -6588,7 +6588,7 @@ sub version_cmp {
return -1;
} elsif ( $b eq '.' ) {
return 1;
} elsif ($a =~ /^\d$/ and $b =~ /^\d$/) {
} elsif ($a =~ /^\d+$/ and $b =~ /^\d+$/) {
if ($a =~ /^0/ || $b =~ /^0/) {
return ($a cmp $b);
} else {