This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=f92c3dd331a96468bf8d2a3e107c5d5039593f10 commit f92c3dd331a96468bf8d2a3e107c5d5039593f10 Author: Guillem Jover <[email protected]> AuthorDate: Mon Sep 8 00:43:36 2025 +0200 perl: Place each statement into its own line Do not concatenate different statements one after the other in the same line, which makes reading the code more difficult. --- dselect/methods/Dselect/Method/Ftp.pm | 16 ++++++++++++---- dselect/methods/ftp/install.pl | 14 +++++++++++--- dselect/methods/ftp/setup.pl | 5 ++++- dselect/mkcurkeys.pl | 5 ++++- scripts/dpkg-checkbuilddeps.pl | 10 ++++++++-- scripts/dpkg-parsechangelog.pl | 6 ++++-- scripts/dpkg-scanpackages.pl | 10 ++++++++-- scripts/dpkg-scansources.pl | 10 ++++++++-- scripts/dpkg-shlibdeps.pl | 9 ++++++--- 9 files changed, 65 insertions(+), 20 deletions(-) diff --git a/dselect/methods/Dselect/Method/Ftp.pm b/dselect/methods/Dselect/Method/Ftp.pm index d22bea821..1482e193b 100644 --- a/dselect/methods/Dselect/Method/Ftp.pm +++ b/dselect/methods/Dselect/Method/Ftp.pm @@ -87,12 +87,17 @@ sub do_connect { } else { $rpass = $opts{password}; } - if(!$ftp->login($remoteuser, $rpass)) - { print $ftp->message() . "\n"; $exit = 1; } + if (! $ftp->login($remoteuser, $rpass)) { + print $ftp->message() . "\n"; + $exit = 1; + } } if (!$exit) { print "Setting transfer mode to binary...\n"; - if(!$ftp->binary()) { print $ftp->message . "\n"; $exit = 1; } + if (! $ftp->binary()) { + print $ftp->message . "\n"; + $exit = 1; + } } if (!$exit) { print "Cd to '$opts{ftpdir}'...\n"; @@ -113,7 +118,10 @@ sub do_connect { last TRY_CONNECT; } -# if(!$ftp->pasv()) { print $ftp->message . "\n"; die 'error'; } +# if (! $ftp->pasv()) { +# print $ftp->message . "\n"; +# die 'error'; +# } return $ftp; } diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl index 487caba58..f8fd764fe 100755 --- a/dselect/methods/ftp/install.pl +++ b/dselect/methods/ftp/install.pl @@ -71,7 +71,9 @@ if (-f "$methdir/md5sums") { if ($@) { die "couldn't eval $methdir/md5sums content: $@\n"; } - if (ref($res)) { %md5sums = %{$res} } + if (ref($res)) { + %md5sums = %{$res} + } } # Get a stanza. @@ -318,7 +320,10 @@ sub download { } } - if (! @getfiles) { $i++; next; } + if (! @getfiles) { + $i++; + next; + } $ftp = do_connect( ftpsite => $site->[0], @@ -560,7 +565,10 @@ if (yesno('y', "\nDo you want to install the files fetched")) { @filename = map { "$dldir/$_" } @filename; next if (! @filename); $r = system('dpkg', '-iB', '--', @filename); - if ($r) { print "DPKG ERROR\n"; $exit = 1; } + if ($r) { + print "DPKG ERROR\n"; + $exit = 1; + } } #Installing other packages after $r = system('dpkg', '-iGREOB', $dldir); diff --git a/dselect/methods/ftp/setup.pl b/dselect/methods/ftp/setup.pl index 5922eb443..f28f609fb 100755 --- a/dselect/methods/ftp/setup.pl +++ b/dselect/methods/ftp/setup.pl @@ -126,7 +126,10 @@ sub download { foreach my $dist (@dists) { my $dir = "$dist/binary-$arch"; print "Checking $dir...\n"; -# if (!$ftp->pasv()) { print $ftp->message . "\n"; die 'error'; } +# if (!$ftp->pasv()) { +# print $ftp->message . "\n"; +# die 'error'; +# } my @dirlst = $ftp->ls("$dir/"); my $got_pkgfile = 0; diff --git a/dselect/mkcurkeys.pl b/dselect/mkcurkeys.pl index 406b8b9bf..de2cd5b36 100755 --- a/dselect/mkcurkeys.pl +++ b/dselect/mkcurkeys.pl @@ -83,7 +83,10 @@ my ($comma); for my $i (33 .. 126) { my $k = $i; my $v = pack('C', $i); - if ($v eq ',') { $comma = $k; next; } + if ($v eq ',') { + $comma = $k; + next; + } p($k, $v); } diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl index b69192dc5..71e5e16fb 100755 --- a/scripts/dpkg-checkbuilddeps.pl +++ b/scripts/dpkg-checkbuilddeps.pl @@ -70,8 +70,14 @@ my $bp_value; my $host_arch = get_host_arch(); my $admindir = $Dpkg::ADMINDIR; my @options_spec = ( - 'help|?' => sub { usage(); exit(0); }, - 'version' => sub { version(); exit 0; }, + 'help|?' => sub { + usage(); + exit 0; + }, + 'version' => sub { + version(); + exit 0; + }, 'A' => \$ignore_bd_arch, 'B' => \$ignore_bd_indep, 'I' => \$ignore_bd_builtin, diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl index 8c4a1a438..782347838 100755 --- a/scripts/dpkg-parsechangelog.pl +++ b/scripts/dpkg-parsechangelog.pl @@ -114,9 +114,11 @@ while (@ARGV) { } elsif ($arg eq '--all') { $options{all} = undef; } elsif ($arg eq '-?' or $arg eq '--help') { - usage(); exit(0); + usage(); + exit 0; } elsif ($arg eq '--version') { - version(); exit(0); + version(); + exit 0; } else { usageerr(g_("unknown option '%s'"), $arg); } diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index 34a69d55f..61c34a7ba 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -44,8 +44,14 @@ my %overridden; my @checksums; my %options = ( - help => sub { usage(); exit 0; }, - version => sub { version(); exit 0; }, + help => sub { + usage(); + exit 0; + }, + version => sub { + version(); + exit 0; + }, type => undef, arch => undef, hash => undef, diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl index 0c92e814a..d2a7ab7fc 100755 --- a/scripts/dpkg-scansources.pl +++ b/scripts/dpkg-scansources.pl @@ -63,8 +63,14 @@ my @sources; my @option_spec = ( 'debug!' => \$debug, - 'help|?' => sub { usage(); exit 0; }, - 'version' => sub { version(); exit 0; }, + 'help|?' => sub { + usage(); + exit 0; + }, + 'version' => sub { + version(); + exit 0; + }, 'no-sort|n' => \$no_sort, 'source-override|s=s' => \$src_override, 'extra-override|e=s' => \$extra_override_file, diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 823be12d0..74168a003 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -60,7 +60,8 @@ my %warn2bits = ( # By increasing importance my @depfields = qw(Suggests Recommends Depends Pre-Depends); -my $i = 0; my %depstrength = map { $_ => $i++ } @depfields; +my $i = 0; +my %depstrength = map { $_ => $i++ } @depfields; textdomain('dpkg-dev'); @@ -106,9 +107,11 @@ foreach (@ARGV) { } elsif (m/^-O(.+)$/) { $varlistfile = $1; } elsif (m/^-(?:\?|-help)$/) { - usage(); exit(0); + usage(); + exit 0; } elsif (m/^--version$/) { - version(); exit(0); + version(); + exit 0; } elsif (m/^--admindir=(.*)$/) { $admindir = $1; if (not -d $admindir) { -- Dpkg.Org's dpkg
