summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-12-04 14:44:47 +0000
committerFrancois Pons <fpons@mandriva.com>2000-12-04 14:44:47 +0000
commit26907aa58016b09ace283e60ac1f615f67e7ee87 (patch)
tree033c5fe9272c14f4d803cccdbb75311e1abe58a0
parent411b56164fe2c786e452efc2e53c4c05ac92a70f (diff)
downloaddrakx-26907aa58016b09ace283e60ac1f615f67e7ee87.tar
drakx-26907aa58016b09ace283e60ac1f615f67e7ee87.tar.gz
drakx-26907aa58016b09ace283e60ac1f615f67e7ee87.tar.bz2
drakx-26907aa58016b09ace283e60ac1f615f67e7ee87.tar.xz
drakx-26907aa58016b09ace283e60ac1f615f67e7ee87.zip
fixed compareVersion for deadlock. removed silly CODE print on deporder problems.
-rw-r--r--perl-install/pkgs.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 90744fb30..28c1502ec 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -826,7 +826,7 @@ sub versionCompare($$) {
local $_;
while ($a || $b) {
- my ($sb, $sa) = map { $1 if ($a || 0) =~ /^\W*\d/ ? s/^\W*0*(\d+)// : s/^\W*(\D+)// } ($b, $a);
+ my ($sb, $sa) = map { $1 if $a =~ /^\W*\d/ ? s/^\W*0*(\d+)// : s/^\W*(\D+)// } ($b, $a);
$_ = length($sa) cmp length($sb) || $sa cmp $sb and return $_;
}
}
@@ -1303,9 +1303,7 @@ sub install($$$;$$) {
c::rpmtransAddPackage($trans, $_->[$HEADER], packageName($_), $isUpgrade && allowedToUpgrade(packageName($_)))
foreach @transToInstall;
- c::rpmdepOrder($trans) or
- die "error ordering package list: " . c::rpmErrorString(),
- sub { c::rpmdbClose($db) };
+ c::rpmdepOrder($trans) or die "error ordering package list: " . c::rpmErrorString();
c::rpmtransSetScriptFd($trans, fileno LOG);
log::l("rpmRunTransactions start");