summaryrefslogtreecommitdiffstats
path: root/urpmi
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-01-10 13:18:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-01-10 13:18:45 +0000
commitd195c7b675d811524741e7ae0129242464b39be6 (patch)
tree15e33e8bd58b88eef4aecb83d4a866d4909d016a /urpmi
parente8df49d47cec9100b956d54a50c59fdd7f07c45c (diff)
downloadurpmi-d195c7b675d811524741e7ae0129242464b39be6.tar
urpmi-d195c7b675d811524741e7ae0129242464b39be6.tar.gz
urpmi-d195c7b675d811524741e7ae0129242464b39be6.tar.bz2
urpmi-d195c7b675d811524741e7ae0129242464b39be6.tar.xz
urpmi-d195c7b675d811524741e7ae0129242464b39be6.zip
no_comment
Diffstat (limited to 'urpmi')
-rwxr-xr-xurpmi6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpmi b/urpmi
index 48ea7d15..a1000d5b 100755
--- a/urpmi
+++ b/urpmi
@@ -68,7 +68,7 @@ $ok or exit 1;
@installed = `/bin/rpm -qa`; $? and die(_("rpm database query failed\n"));
foreach (@installed) {
- my ($name, $v, $r) = /(.*)-([^-]+)-([^-.]+)/;
+ my ($name, $v, $r) = /(.*)-([^-]+)-([^-.]+)\n/;
exists $installed{$name} && le_version([$v, $r], $installed{$name}) or $installed{$name} = [$v, $r];
}
@installed{map { chop; $_ } @installed} = ();
@@ -86,7 +86,7 @@ if (!$auto and difference2(\@to_install, \@packages)) {
$? and exit 0;
} else {
print SAVEOUT "$msg:\n@to_install\n$msg2 (Y/n) ";
- <STDIN> =~ /n/i or exit 0;
+ <STDIN> =~ /n/i and exit 0;
}
}
@@ -210,7 +210,7 @@ sub version_compare {
}
sub le_version {
my $cmp = version_compare($_[0][0], $_[1][0]);
- return $cmp < 0 || $cmp == 0 && version_compare($_[0][1], $_[1][1]) < 0;
+ return $cmp < 0 || $cmp == 0 && version_compare($_[0][1], $_[1][1]) <= 0;
}
sub toMb {