From ab56fbd7cf9d3596403fa5aae8c74366d43fec40 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Sat, 8 Sep 2012 08:30:10 +0000
Subject: (_curl_action) kill unused parameter that could never have been used

rationale: an array must be the last variable in a prototype

bug introcuded in commit r258682 by cfergeau on 2009-07-30:
"dudf patch from Olivier Rosello for the Mancoosi project"

further not fixed in commit r258683 by cfergeau on 2009-07-30:
"slight clean-up in wget downloading handling"

dudf support was always broken...

interesting enough, this was spot by perl_checker but only when
checking all files at once, not when checking urpm/download.pm only
---
 urpm/download.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'urpm')

diff --git a/urpm/download.pm b/urpm/download.pm
index 9f9624d6..491460d9 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -522,7 +522,7 @@ sub sync_curl {
 }
 
 sub _curl_action {
-    my ($cmd, $options, @l, $o_is_upload) = @_;
+    my ($cmd, $options, @l) = @_;
     
 	my ($buf, $file); $buf = '';
 	my $curl_pid = open(my $curl, "$cmd |");
@@ -541,8 +541,6 @@ sub _curl_action {
 			if (propagate_sync_callback($options, 'progress', $file, $percent, $total, $eta, $speed) eq 'canceled') {
 			    kill 15, $curl_pid;
 			    close $curl;
-			    
-			    die N("curl failed: upload canceled\n") if $o_is_upload;
 			    die N("curl failed: download canceled\n");
 			}
 			#- this checks that download has actually started
-- 
cgit v1.2.1