diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-08 08:30:10 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-08 08:30:10 +0000 |
| commit | ab56fbd7cf9d3596403fa5aae8c74366d43fec40 (patch) | |
| tree | dde1f2cb01c9d710f32d3eb52d46ba2c25198ec1 | |
| parent | 10950fee75c10b2fabf66f45e21c3ede005e3e4a (diff) | |
| download | urpmi-ab56fbd7cf9d3596403fa5aae8c74366d43fec40.tar urpmi-ab56fbd7cf9d3596403fa5aae8c74366d43fec40.tar.gz urpmi-ab56fbd7cf9d3596403fa5aae8c74366d43fec40.tar.bz2 urpmi-ab56fbd7cf9d3596403fa5aae8c74366d43fec40.tar.xz urpmi-ab56fbd7cf9d3596403fa5aae8c74366d43fec40.zip | |
(_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
| -rw-r--r-- | urpm/download.pm | 4 |
1 files changed, 1 insertions, 3 deletions
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 |