From 2f3e76593e5441d3bba8d578c926e0dae2fd4c71 Mon Sep 17 00:00:00 2001 From: xq2005 Date: Tue, 3 Dec 2013 06:39:02 -0800 Subject: [PATCH] bug 3919 : sync from master --- perl-xCAT/xCAT/Utils.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm index 0c0560012..450607c30 100644 --- a/perl-xCAT/xCAT/Utils.pm +++ b/perl-xCAT/xCAT/Utils.pm @@ -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 {