summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-10-27 18:28:11 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-10-27 18:28:11 +0000
commit9a535a669b82d374106c58d7407fc1033de467b0 (patch)
tree1cabe364d20ab4b3639e1c48cf4bb7151945d750
parentc122d0b8dec1c9fbf9f74e212dc02cac53c7c8a1 (diff)
downloadurpmi-9a535a669b82d374106c58d7407fc1033de467b0.tar
urpmi-9a535a669b82d374106c58d7407fc1033de467b0.tar.gz
urpmi-9a535a669b82d374106c58d7407fc1033de467b0.tar.bz2
urpmi-9a535a669b82d374106c58d7407fc1033de467b0.tar.xz
urpmi-9a535a669b82d374106c58d7407fc1033de467b0.zip
- quotemeta arguments
- ensure "rpm -e" is not localized when looking for "package XXX is not installed" and "XXX is needed by XXX"
-rw-r--r--urpme4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpme b/urpme
index 85394743..50610fc4 100644
--- a/urpme
+++ b/urpme
@@ -34,7 +34,7 @@ if (!$matches) {
}
}
if ($matches || $maymatch) {
- my $match = join "|", @l;
+ my $match = join "|", map { quotemeta } @l;
@m = grep { /$match/ } map { chop; $_ } `rpm -qa`;
if ($maymatch) {
@@ -48,7 +48,7 @@ load_provides();
my %toremove; @toremove{$_, @{$provides{$_} || []}} = () foreach @m;
my $changed = 1; while ($changed) { $changed = 0;
local *F;
- open F, "rpm -e --test " . join(" ", keys %toremove) . " 2>&1 |";
+ open F, "LANGUAGE=C rpm -e --test " . join(" ", keys %toremove) . " 2>&1 |";
foreach (<F>) {
if (/package (\S+) is not installed/) {
delete $toremove{$1};