summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-10 13:13:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-10 13:13:09 +0000
commitc84ced75ca6a90579bdd530c08dfc3b8272c9273 (patch)
tree71fd19beac56d089b25e7c2f9642e77b3a734553 /urpm
parent6203c9e41abd67a522824c76efff26ef8b12561c (diff)
downloadurpmi-c84ced75ca6a90579bdd530c08dfc3b8272c9273.tar
urpmi-c84ced75ca6a90579bdd530c08dfc3b8272c9273.tar.gz
urpmi-c84ced75ca6a90579bdd530c08dfc3b8272c9273.tar.bz2
urpmi-c84ced75ca6a90579bdd530c08dfc3b8272c9273.tar.xz
urpmi-c84ced75ca6a90579bdd530c08dfc3b8272c9273.zip
revert using --no-locales on urpmq, keep it a special case for now
(for compat with urpmi < 6.1)
Diffstat (limited to 'urpm')
-rw-r--r--urpm/parallel_ka_run.pm5
-rw-r--r--urpm/parallel_ssh.pm5
2 files changed, 8 insertions, 2 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index b1f5dc65..1d9cb5d6 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -28,7 +28,10 @@ $rshp_command ||= 'rshp';
sub _rshp_urpm {
my ($parallel, $urpm, $rshp_option, $cmd, $para) = @_;
- my $command = "$rshp_command $rshp_option $parallel->{options} -- $cmd --no-locales $para";
+ # it doesn't matter for urpmq, and previous version of urpmq didn't handle it:
+ $cmd ne 'urpmq' and $para = "--no-locales $para";
+
+ my $command = "$rshp_command $rshp_option $parallel->{options} -- $cmd $para";
$urpm->{log}("parallel_ka_run: $command");
$command;
}
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index d2a55513..b2716e37 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -56,7 +56,10 @@ sub _ssh_urpm {
$cmd ne 'urpme' && _localhost($node) and $para = "--nolock $para";
- my $command = _ssh($node) . " $cmd --no-locales $para";
+ # it doesn't matter for urpmq, and previous version of urpmq didn't handle it:
+ $cmd ne 'urpmq' and $para = "--no-locales $para";
+
+ my $command = _ssh($node) . " $cmd $para";
$urpm->{log}("parallel_ssh: $command");
$command;
}