summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-11-17 10:54:36 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-11-17 10:54:36 +0000
commitdb7e0e3922516d5bba7f28e06bb4fd5485d72363 (patch)
tree61d1ba7dc0f66233fb2b4cbec586b74053ddb416
parent839e03c164ca97b815877e2eaad9d8abee8e8b45 (diff)
downloadurpmi-db7e0e3922516d5bba7f28e06bb4fd5485d72363.tar
urpmi-db7e0e3922516d5bba7f28e06bb4fd5485d72363.tar.gz
urpmi-db7e0e3922516d5bba7f28e06bb4fd5485d72363.tar.bz2
urpmi-db7e0e3922516d5bba7f28e06bb4fd5485d72363.tar.xz
urpmi-db7e0e3922516d5bba7f28e06bb4fd5485d72363.zip
Use taktuk2 instead of ka if available. Make it overriable with the
URPMI_MPUT_COMMAND and URPMI_RSHP_COMMAND environment variables.
-rw-r--r--urpm/parallel_ka_run.pm13
1 files changed, 11 insertions, 2 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index bbb5d3c0..c9141b18 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -3,8 +3,17 @@ package urpm::parallel_ka_run;
use strict;
(our $VERSION) = q$Id$ =~ /(\d+\.\d+)/;
-our $mput_command = 'mput';
-our $rshp_command = 'rshp';
+our $mput_command = $ENV{URPMI_MPUT_COMMAND};
+our $rshp_command = $ENV{URPMI_RSHP_COMMAND};
+
+if (!$mput_command) {
+ $mput_command = grep -x, qw(/usr/bin/mput2 /usr/bin/mput);
+}
+$mput_command = 'mput' unless $mput_command;
+if (!$rshp_command) {
+ $rshp_command = grep -x, qw(/usr/bin/rshp2 /usr/bin/rshp);
+}
+$rshp_command = 'rshp' unless $rshp_command;
#- parallel copy
sub parallel_register_rpms {