This commit is contained in:
committed by
Git OBS Bridge
parent
090779a064
commit
8e55a85d14
36
rpmsort
36
rpmsort
@@ -17,7 +17,7 @@
|
||||
|
||||
use Getopt::Long qw(:config gnu_getopt);
|
||||
|
||||
sub do_rpm_cmp_versions {
|
||||
sub rpm_cmp_versions {
|
||||
my ($evr1, $evr2) = @_;
|
||||
|
||||
sub _rpm_cmp {
|
||||
@@ -31,10 +31,8 @@ sub do_rpm_cmp_versions {
|
||||
$s1 =~ s/^[^a-zA-Z0-9]+//;
|
||||
$s2 =~ s/^[^a-zA-Z0-9]+//;
|
||||
if ($s1 =~ /^\d/ || $s2 =~ /^\d/) {
|
||||
$s1 =~ s/^(0*(\d*))//; $x1 = $2;
|
||||
return -1 if $1 eq '';
|
||||
$s2 =~ s/^(0*(\d*))//; $x2 = $2;
|
||||
return 1 if $1 eq '';
|
||||
$s1 =~ s/^0*(\d*)//; $x1 = $1;
|
||||
$s2 =~ s/^0*(\d*)//; $x2 = $1;
|
||||
$r = length $x1 <=> length $x2 || $x1 cmp $x2;
|
||||
} else {
|
||||
$s1 =~ s/^([a-zA-Z]*)//; $x1 = $1;
|
||||
@@ -59,35 +57,11 @@ sub do_rpm_cmp_versions {
|
||||
|
||||
my $reorder = sub { return @_ };
|
||||
my $key = 0;
|
||||
my $test = 0;
|
||||
|
||||
sub rpm_cmp_versions {
|
||||
my ($evr1, $evr2) = @_;
|
||||
|
||||
chomp($evr1, $evr2);
|
||||
my $res1 = do_rpm_cmp_versions($evr1, $evr2);
|
||||
if ($test) {
|
||||
open(my $fd, '-|', 'zypper', '--terse', 'versioncmp',
|
||||
$evr1, $evr2) or die "zypper: $!\n";
|
||||
my $res2 = <$fd>;
|
||||
close($fd) or die "zypper: $!\n";
|
||||
chomp $res2;
|
||||
if ($res1 != $res2) {
|
||||
my @operators = qw(< == >);
|
||||
my $op1 = $operators[$res1 + 1];
|
||||
my $op2 = $operators[$res2 + 1];
|
||||
|
||||
print STDERR "BUG: $evr1 $op1 $evr2 vs. zypper: $evr1 $op2 $evr2\n";
|
||||
}
|
||||
}
|
||||
return $res1;
|
||||
}
|
||||
|
||||
GetOptions ("r|reverse" => sub { $reorder = sub { return reverse @_ } },
|
||||
"k|key=i" => \$key,
|
||||
"test" => \$test)
|
||||
"k|key=i" => \$key)
|
||||
or do {
|
||||
print STDERR "Usage $0 [-r, --reverse] [-k N, --key=N] [--test]\n";
|
||||
print STDERR "Usage\n";
|
||||
exit 1;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user