summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-12-06 14:47:26 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-12-06 14:47:26 +0000
commit6f4f5ae9f37abaedff2bd6af0b3581e837f86065 (patch)
treea91181c686a5cb09f071c001a73fb908a48481c7
parent20b212f6836cf596f9055cefcb06948a599e875b (diff)
downloadurpmi-6f4f5ae9f37abaedff2bd6af0b3581e837f86065.tar
urpmi-6f4f5ae9f37abaedff2bd6af0b3581e837f86065.tar.gz
urpmi-6f4f5ae9f37abaedff2bd6af0b3581e837f86065.tar.bz2
urpmi-6f4f5ae9f37abaedff2bd6af0b3581e837f86065.tar.xz
urpmi-6f4f5ae9f37abaedff2bd6af0b3581e837f86065.zip
The parallel handlers define the same function. This could lead to warnings; silence them.
-rw-r--r--t/01compile.t1
-rw-r--r--urpm/parallel_ka_run.pm2
-rw-r--r--urpm/parallel_ssh.pm2
3 files changed, 4 insertions, 1 deletions
diff --git a/t/01compile.t b/t/01compile.t
index d77c1a7e..753c5ff6 100644
--- a/t/01compile.t
+++ b/t/01compile.t
@@ -2,7 +2,6 @@
use strict;
use warnings;
-no warnings 'redefine';
use Test::More tests => 10;
for my $module (glob("urpm/*.pm")) {
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm
index 4100ee96..cb4f2d6c 100644
--- a/urpm/parallel_ka_run.pm
+++ b/urpm/parallel_ka_run.pm
@@ -250,6 +250,8 @@ sub parallel_install {
package urpm;
+no warnings 'redefine';
+
sub handle_parallel_options {
my (undef, $options) = @_;
my ($media, $ka_run_options) = $options =~ /ka-run(?:\(([^\)]*)\))?:(.*)/;
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm
index 04b56fbc..1ed4406a 100644
--- a/urpm/parallel_ssh.pm
+++ b/urpm/parallel_ssh.pm
@@ -287,6 +287,8 @@ sub parallel_install {
package urpm;
+no warnings 'redefine';
+
sub handle_parallel_options {
my (undef, $options) = @_;
my ($id, @nodes) = split /:/, $options;