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=ccf620a0d5e7b01cacb42da3d666dc185a84ebcb commit ccf620a0d5e7b01cacb42da3d666dc185a84ebcb Author: Guillem Jover <[email protected]> AuthorDate: Wed Dec 28 01:25:37 2022 +0100 perl: Fix list and hash literals indentation Changelog: internal --- dselect/methods/Dselect/Ftp.pm | 26 ++++++++++++++------------ scripts/Dpkg/Shlibs/Cppfilt.pm | 8 ++++++-- scripts/Dpkg/Source/Archive.pm | 16 ++++++++++------ scripts/Dpkg/Source/Patch.pm | 26 ++++++++++++++++++++++---- scripts/Dpkg/Vendor/Ubuntu.pm | 13 ++++++++----- scripts/dpkg-scanpackages.pl | 19 ++++++++++--------- scripts/t/Dpkg_Version.t | 12 +++++++----- 7 files changed, 77 insertions(+), 43 deletions(-) diff --git a/dselect/methods/Dselect/Ftp.pm b/dselect/methods/Dselect/Ftp.pm index b71457c76..2b6527b29 100644 --- a/dselect/methods/Dselect/Ftp.pm +++ b/dselect/methods/Dselect/Ftp.pm @@ -310,18 +310,20 @@ sub do_connect { # assume server supports MDTM - will be adjusted if needed my $has_mdtm = 1; -my %months = ('Jan', 0, - 'Feb', 1, - 'Mar', 2, - 'Apr', 3, - 'May', 4, - 'Jun', 5, - 'Jul', 6, - 'Aug', 7, - 'Sep', 8, - 'Oct', 9, - 'Nov', 10, - 'Dec', 11); +my %months = ( + Jan => 0, + Feb => 1, + Mar => 2, + Apr => 3, + May => 4, + Jun => 5, + Jul => 6, + Aug => 7, + Sep => 8, + Oct => 9, + Nov => 10, + Dec => 11, +); my $ls_l_re = qr< ([^ ]+\ *){5} # Perms, Links, User, Group, Size diff --git a/scripts/Dpkg/Shlibs/Cppfilt.pm b/scripts/Dpkg/Shlibs/Cppfilt.pm index d5a8bb209..c2a4756fd 100644 --- a/scripts/Dpkg/Shlibs/Cppfilt.pm +++ b/scripts/Dpkg/Shlibs/Cppfilt.pm @@ -45,8 +45,12 @@ sub get_cppfilt { if (exists $cppfilts{$type}) { $filt = $cppfilts{$type}; } else { - $filt = { from => undef, to => undef, - last_symbol => '', last_result => '' }; + $filt = { + from => undef, + to => undef, + last_symbol => '', + last_result => '', + }; $filt->{pid} = spawn(exec => [ 'c++filt', "--format=$type" ], from_pipe => \$filt->{from}, to_pipe => \$filt->{to}); diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm index 2ddd04af8..88e6700fd 100644 --- a/scripts/Dpkg/Source/Archive.pm +++ b/scripts/Dpkg/Source/Archive.pm @@ -53,10 +53,12 @@ sub create { my $mtime = $opts{source_date} // $ENV{SOURCE_DATE_EPOCH} || time; # Call tar creation process $spawn_opts{delete_env} = [ 'TAR_OPTIONS' ]; - $spawn_opts{exec} = [ $Dpkg::PROGTAR, '-cf', '-', '--format=gnu', '--sort=name', - '--mtime', "\@$mtime", '--clamp-mtime', '--null', - '--numeric-owner', '--owner=0', '--group=0', - @{$opts{options}}, '-T', '-' ]; + $spawn_opts{exec} = [ + $Dpkg::PROGTAR, '-cf', '-', '--format=gnu', '--sort=name', + '--mtime', "\@$mtime", '--clamp-mtime', '--null', + '--numeric-owner', '--owner=0', '--group=0', + @{$opts{options}}, '-T', '-', + ]; *$self->{pid} = spawn(%spawn_opts); *$self->{cwd} = getcwd(); } @@ -126,8 +128,10 @@ sub extract { # Call tar extraction process $spawn_opts{delete_env} = [ 'TAR_OPTIONS' ]; - $spawn_opts{exec} = [ $Dpkg::PROGTAR, '-xf', '-', '--no-same-permissions', - '--no-same-owner', @{$opts{options}} ]; + $spawn_opts{exec} = [ + $Dpkg::PROGTAR, '-xf', '-', '--no-same-permissions', + '--no-same-owner', @{$opts{options}}, + ]; spawn(%spawn_opts); $self->close(); diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm index 58255c42e..e670898fc 100644 --- a/scripts/Dpkg/Source/Patch.pm +++ b/scripts/Dpkg/Source/Patch.pm @@ -583,8 +583,16 @@ sub apply { $opts{force_timestamp} //= 1; $opts{remove_backup} //= 1; $opts{create_dirs} //= 1; - $opts{options} ||= [ '-t', '-F', '0', '-N', '-p1', '-u', - '-V', 'never', '-b', '-z', '.dpkg-orig']; + $opts{options} ||= [ + '-t', + '-F', '0', + '-N', + '-p1', + '-u', + '-V', 'never', + '-b', + '-z', '.dpkg-orig', + ]; $opts{add_options} //= []; push @{$opts{options}}, @{$opts{add_options}}; # Check the diff and create missing directories @@ -634,8 +642,18 @@ sub check_apply { my ($self, $destdir, %opts) = @_; # Set default values to options $opts{create_dirs} //= 1; - $opts{options} ||= [ '--dry-run', '-s', '-t', '-F', '0', '-N', '-p1', '-u', - '-V', 'never', '-b', '-z', '.dpkg-orig']; + $opts{options} ||= [ + '--dry-run', + '-s', + '-t', + '-F', '0', + '-N', + '-p1', + '-u', + '-V', 'never', + '-b', + '-z', '.dpkg-orig', + ]; $opts{add_options} //= []; push @{$opts{options}}, @{$opts{add_options}}; # Check the diff and create missing directories diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm index e222088ff..e417d6ee9 100644 --- a/scripts/Dpkg/Vendor/Ubuntu.pm +++ b/scripts/Dpkg/Vendor/Ubuntu.pm @@ -76,11 +76,14 @@ sub run_hook { '/usr/share/keyrings/ubuntu-archive-removed-keys.gpg'); } elsif ($hook eq 'register-custom-fields') { my @field_ops = $self->SUPER::run_hook($hook); - push @field_ops, - [ 'register', 'Launchpad-Bugs-Fixed', - CTRL_FILE_CHANGES | CTRL_CHANGELOG ], - [ 'insert_after', CTRL_FILE_CHANGES, 'Closes', 'Launchpad-Bugs-Fixed' ], - [ 'insert_after', CTRL_CHANGELOG, 'Closes', 'Launchpad-Bugs-Fixed' ]; + push @field_ops, [ + 'register', 'Launchpad-Bugs-Fixed', + CTRL_FILE_CHANGES | CTRL_CHANGELOG, + ], [ + 'insert_after', CTRL_FILE_CHANGES, 'Closes', 'Launchpad-Bugs-Fixed', + ], [ + 'insert_after', CTRL_CHANGELOG, 'Closes', 'Launchpad-Bugs-Fixed', + ]; return @field_ops; } elsif ($hook eq 'post-process-changelog-entry') { diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index 3da031129..2fa6e53bb 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -44,15 +44,16 @@ my %packages; my %overridden; my @checksums; -my %options = (help => sub { usage(); exit 0; }, - version => sub { version(); exit 0; }, - type => undef, - arch => undef, - hash => undef, - multiversion => 0, - 'extra-override'=> undef, - medium => undef, - ); +my %options = ( + help => sub { usage(); exit 0; }, + version => sub { version(); exit 0; }, + type => undef, + arch => undef, + hash => undef, + multiversion => 0, + 'extra-override' => undef, + medium => undef, +); my @options_spec = ( 'help|?', diff --git a/scripts/t/Dpkg_Version.t b/scripts/t/Dpkg_Version.t index b6ab06ce5..1de7968ff 100644 --- a/scripts/t/Dpkg_Version.t +++ b/scripts/t/Dpkg_Version.t @@ -27,11 +27,13 @@ use Dpkg::Version; report_options(quiet_warnings => 1); my @tests = <DATA>; -my @ops = ('<', '<<', 'lt', - '<=', 'le', - '=', 'eq', - '>=', 'ge', - '>', '>>', 'gt'); +my @ops = qw( + < << lt + <= le + = eq + >= ge + > >> gt +); plan tests => scalar(@tests) * (3 * scalar(@ops) + 4) + 27; -- Dpkg.Org's dpkg
