diff options
| author | Guillem Jover <guillem@debian.org> | 2017-08-31 03:29:53 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2017-09-24 21:03:09 +0200 |
| commit | 417c80f6fbc6673aac6c42bb1fdc3e0280b01cd1 (patch) | |
| tree | 7b5c84ffdba5c2df585a1ae485ab4e2d9415d967 /dselect/methods/ftp | |
| parent | 0d2b3cee25b74dd3fd9ddc3a469b8b144368c963 (diff) | |
| download | dpkg-417c80f6fbc6673aac6c42bb1fdc3e0280b01cd1.tar.gz | |
Dselect::Ftp: Avoid many function arguments in do_connect()
Addresses: Subroutines::ProhibitManyArgs
Warned-by: perlcritic
Diffstat (limited to 'dselect/methods/ftp')
| -rwxr-xr-x | dselect/methods/ftp/install.pl | 18 | ||||
| -rwxr-xr-x | dselect/methods/ftp/setup.pl | 18 | ||||
| -rwxr-xr-x | dselect/methods/ftp/update.pl | 36 |
3 files changed, 36 insertions, 36 deletions
diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl index 2eb9f16a8..9966e7a5d 100755 --- a/dselect/methods/ftp/install.pl +++ b/dselect/methods/ftp/install.pl @@ -338,15 +338,15 @@ sub download() { if (! @getfiles) { $i++; next; } - $ftp = do_connect ($site->[0], #$::ftpsite, - $site->[4], #$::username, - $site->[5], #$::password, - $site->[1], #$::ftpdir, - $site->[3], #$::passive, - $CONFIG{use_auth_proxy}, - $CONFIG{proxyhost}, - $CONFIG{proxylogname}, - $CONFIG{proxypassword}); + $ftp = do_connect(ftpsite => $site->[0], + ftpdir => $site->[1], + passive => $site->[3], + username => $site->[4], + password => $site->[5], + useproxy => $CONFIG{use_auth_proxy}, + proxyhost => $CONFIG{proxyhost}, + proxylogname => $CONFIG{proxylogname}, + proxypassword => $CONFIG{proxypassword}); local $SIG{INT} = sub { die "Interrupted !\n"; }; diff --git a/dselect/methods/ftp/setup.pl b/dselect/methods/ftp/setup.pl index 18a5832f9..67a86fef6 100755 --- a/dselect/methods/ftp/setup.pl +++ b/dselect/methods/ftp/setup.pl @@ -114,15 +114,15 @@ my $ftp; sub download() { foreach (@{$CONFIG{site}}) { - $ftp = do_connect ($_->[0], # Ftp server - $_->[4], # username - $_->[5], # password - $_->[1], # ftp dir - $_->[3], # passive - $CONFIG{use_auth_proxy}, - $CONFIG{proxyhost}, - $CONFIG{proxylogname}, - $CONFIG{proxypassword}); + $ftp = do_connect(ftpsite => $_->[0], + ftpdir => $_->[1], + passive => $_->[3], + username => $_->[4], + password => $_->[5], + useproxy => $CONFIG{use_auth_proxy}, + proxyhost => $CONFIG{proxyhost}, + proxylogname => $CONFIG{proxylogname}, + proxypassword => $CONFIG{proxypassword}); my @dists = @{$_->[2]}; diff --git a/dselect/methods/ftp/update.pl b/dselect/methods/ftp/update.pl index 68f7a67f5..a40f6f01a 100755 --- a/dselect/methods/ftp/update.pl +++ b/dselect/methods/ftp/update.pl @@ -76,15 +76,15 @@ foreach (@{$CONFIG{site}}) { my $site = $_; - $ftp = do_connect ($_->[0], # Ftp server - $_->[4], # username - $_->[5], # password - $_->[1], # ftp dir - $_->[3], # passive - $CONFIG{use_auth_proxy}, - $CONFIG{proxyhost}, - $CONFIG{proxylogname}, - $CONFIG{proxypassword}); + $ftp = do_connect(ftpsite => $_->[0], + ftpdir => $_->[1], + passive => $_->[3], + username => $_->[4], + password => $_->[5], + useproxy => $CONFIG{use_auth_proxy}, + proxyhost => $CONFIG{proxyhost}, + proxylogname => $CONFIG{proxylogname}, + proxypassword => $CONFIG{proxypassword}); my @dists = @{$_->[2]}; PACKAGE: @@ -166,15 +166,15 @@ foreach (@{$CONFIG{site}}) { $ftp->quit(); }; if (yesno ('y', "Transfer failed at $size: retry at once")) { - $ftp = do_connect ($site->[0], # Ftp server - $site->[4], # username - $site->[5], # password - $site->[1], # ftp dir - $site->[3], # passive - $CONFIG{use_auth_proxy}, - $CONFIG{proxyhost}, - $CONFIG{proxylogname}, - $CONFIG{proxypassword}); + $ftp = do_connect(ftpsite => $site->[0], + ftpdir => $site->[1], + passive => $site->[3], + username => $site->[4], + password => $site->[5], + useproxy => $CONFIG{use_auth_proxy}, + proxyhost => $CONFIG{proxyhost}, + proxylogname => $CONFIG{proxylogname}, + proxypassword => $CONFIG{proxypassword}); if ($newest_pack_date != do_mdtm ($ftp, "$dir/Packages.gz")) { print ("Packages file has changed !\n"); |