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=9823579dde313afb7c287ea22df50a9fa57ca7c4 commit 9823579dde313afb7c287ea22df50a9fa57ca7c4 Author: Guillem Jover <[email protected]> AuthorDate: Mon Aug 25 03:52:55 2025 +0200 perl: Fix indentation for function calls with hash, hashref and listref arguments This pass covers mainly function calls that pass more than one option, as well as some functions that currently pass one option but might exceed the line length or might easily end up passing more in the future. Blame-Ignore: yes --- dselect/methods/Dselect/Method/Ftp.pm | 4 +- dselect/methods/ftp/install.pl | 20 +- dselect/methods/ftp/setup.pl | 20 +- dselect/methods/ftp/update.pl | 40 +-- lib/dpkg/t/t-tarextract.t | 31 ++- lib/dpkg/t/t-treewalk.t | 8 +- lib/dpkg/t/t-trigdeferred.t | 8 +- scripts/Dpkg/Changelog/Parse.pm | 8 +- scripts/Dpkg/Compression/FileHandle.pm | 18 +- scripts/Dpkg/Control/Tests.pm | 5 +- scripts/Dpkg/Control/Tests/Entry.pm | 5 +- scripts/Dpkg/IPC.pm | 7 +- scripts/Dpkg/Index.pm | 6 +- scripts/Dpkg/OpenPGP/Backend/GnuPG.pm | 15 +- scripts/Dpkg/OpenPGP/Backend/SOP.pm | 13 +- scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 11 +- scripts/Dpkg/Path.pm | 6 +- scripts/Dpkg/Shlibs/Cppfilt.pm | 16 +- scripts/Dpkg/Shlibs/SymbolFile.pm | 6 +- scripts/Dpkg/Source/Archive.pm | 6 +- scripts/Dpkg/Source/Package.pm | 14 +- scripts/Dpkg/Source/Package/V1.pm | 35 ++- scripts/Dpkg/Source/Package/V2.pm | 115 +++++--- scripts/Dpkg/Source/Package/V3/Bzr.pm | 8 +- scripts/Dpkg/Source/Package/V3/Native.pm | 13 +- scripts/Dpkg/Source/Package/V3/Quilt.pm | 5 +- scripts/Dpkg/Source/Patch.pm | 40 ++- scripts/Dpkg/Source/Quilt.pm | 46 +++- scripts/dpkg-buildpackage.pl | 5 +- scripts/dpkg-checkbuilddeps.pl | 25 +- scripts/dpkg-genbuildinfo.pl | 8 +- scripts/dpkg-gencontrol.pl | 28 +- scripts/dpkg-gensymbols.pl | 46 +++- scripts/dpkg-mergechangelogs.pl | 21 +- scripts/dpkg-name.pl | 4 +- scripts/dpkg-scanpackages.pl | 8 +- scripts/dpkg-scansources.pl | 12 +- scripts/dpkg-shlibdeps.pl | 18 +- scripts/dpkg-source.pl | 36 ++- scripts/t/Dpkg_Changelog.t | 435 ++++++++++++++++++++++--------- scripts/t/Dpkg_Conf.t | 14 +- scripts/t/Dpkg_Deps.t | 101 +++++-- scripts/t/Dpkg_Dist_Files.t | 14 +- scripts/t/Dpkg_Getopt.t | 10 +- scripts/t/Dpkg_IPC.t | 34 ++- scripts/t/Dpkg_Shlibs.t | 354 ++++++++++++++++++------- scripts/t/Dpkg_Source_Patch.t | 4 +- scripts/t/Dpkg_Substvars.t | 14 +- scripts/t/Dpkg_Version.t | 8 +- scripts/t/dpkg_buildpackage.t | 26 +- scripts/t/dpkg_mergechangelogs.t | 10 +- scripts/t/dpkg_source.t | 41 +-- scripts/t/mk.t | 7 +- utils/t/update_alternatives.t | 269 ++++++++++++++----- 54 files changed, 1478 insertions(+), 603 deletions(-) diff --git a/dselect/methods/Dselect/Method/Ftp.pm b/dselect/methods/Dselect/Method/Ftp.pm index 23d0cc4e7..7055c1ec9 100644 --- a/dselect/methods/Dselect/Method/Ftp.pm +++ b/dselect/methods/Dselect/Method/Ftp.pm @@ -63,7 +63,9 @@ sub do_connect { $remoteuser = $opts{username}; } print "Connecting to $opts{ftpsite}...\n"; - $ftp = Net::FTP->new($remotehost, Passive => $opts{passive}); + $ftp = Net::FTP->new($remotehost, + Passive => $opts{passive}, + ); if(!$ftp || !$ftp->ok) { print "Failed to connect\n"; $exit = 1; diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl index c2f901236..a1908f00d 100755 --- a/dselect/methods/ftp/install.pl +++ b/dselect/methods/ftp/install.pl @@ -331,15 +331,17 @@ sub download { if (! @getfiles) { $i++; next; } - $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}); + $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 5b633b177..feaf82684 100755 --- a/dselect/methods/ftp/setup.pl +++ b/dselect/methods/ftp/setup.pl @@ -109,15 +109,17 @@ edit_config('ftp', $methdir); my $ftp; sub download { foreach (@{$CONFIG{site}}) { - $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}); + $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 59ee4c2d9..6ffd14b75 100755 --- a/dselect/methods/ftp/update.pl +++ b/dselect/methods/ftp/update.pl @@ -74,15 +74,17 @@ sub download { foreach (@{$CONFIG{site}}) { my $site = $_; - $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}); + $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: @@ -164,15 +166,17 @@ foreach (@{$CONFIG{site}}) { $ftp->quit(); }; if (yesno ('y', "Transfer failed at $size: retry at once")) { - $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}); + $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"); diff --git a/lib/dpkg/t/t-tarextract.t b/lib/dpkg/t/t-tarextract.t index 89287a77c..563d3b222 100755 --- a/lib/dpkg/t/t-tarextract.t +++ b/lib/dpkg/t/t-tarextract.t @@ -137,12 +137,23 @@ TAR chdir $cwd; my $paths_list = join "\0", @paths; - spawn(exec => [ $Dpkg::PROGTAR, '-cf', "$dirtree.tar", - '--format', $type, - '-C', $dirtree, '--mtime=@100000000', - '--owner=user:100', '--group=group:200', - '--null', '--no-unquote', '--no-recursion', '-T-' ], - wait_child => 1, from_string => \$paths_list); + spawn( + exec => [ + $Dpkg::PROGTAR, + '-cf', "$dirtree.tar", + '--format', $type, + '-C', $dirtree, + '--mtime=@100000000', + '--owner=user:100', + '--group=group:200', + '--null', + '--no-unquote', + '--no-recursion', + '-T-', + ], + wait_child => 1, + from_string => \$paths_list, + ); my $expected = $expected_tar; $expected =~ s/[ug]name=[^ ]+ //g if $type eq 'v7'; @@ -150,8 +161,12 @@ TAR $expected =~ s/\n^.*dddd.*$//mg if $type eq 'v7'; $expected =~ s/\n^.*symlink-long.*$//mg if $type eq 'ustar'; - spawn(exec => [ "$builddir/t/c-tarextract", "$dirtree.tar" ], - no_check => 1, to_string => \$stdout, to_error => \$stderr); + spawn( + exec => [ "$builddir/t/c-tarextract", "$dirtree.tar" ], + no_check => 1, + to_string => \$stdout, + to_error => \$stderr, + ); ok($? == 0, "tar extractor $type should succeed"); is($stderr, undef, "tar extractor $type stderr is empty"); is($stdout, $expected, "tar extractor $type is ok"); diff --git a/lib/dpkg/t/t-treewalk.t b/lib/dpkg/t/t-treewalk.t index 0e54bf32c..db22434f6 100755 --- a/lib/dpkg/t/t-treewalk.t +++ b/lib/dpkg/t/t-treewalk.t @@ -144,8 +144,12 @@ sub test_treewalker { $ENV{TREEWALK_SKIP} = $type eq 'skip' ? "$dirtree/cccc" : undef; - spawn(exec => [ "$builddir/t/c-treewalk", $dirtree ], - no_check => 1, to_string => \$stdout, to_error => \$stderr); + spawn( + exec => [ "$builddir/t/c-treewalk", $dirtree ], + no_check => 1, + to_string => \$stdout, + to_error => \$stderr, + ); ok($? == 0, "tree walker $type should succeed"); is($stderr, undef, "tree walker $type stderr is empty"); is($stdout, $expected, "tree walker $type is ok"); diff --git a/lib/dpkg/t/t-trigdeferred.t b/lib/dpkg/t/t-trigdeferred.t index b9142ea63..ca39e39f2 100755 --- a/lib/dpkg/t/t-trigdeferred.t +++ b/lib/dpkg/t/t-trigdeferred.t @@ -96,8 +96,12 @@ sub test_trigdeferred { foreach my $test (@deferred) { file_dump("$admindir/triggers/Unincorp", $test->{original}); - spawn(exec => [ "$builddir/t/c-trigdeferred", $admindir ], - no_check => 1, to_string => \$stdout, error_to_string => \$stderr); + spawn( + exec => [ "$builddir/t/c-trigdeferred", $admindir ], + no_check => 1, + to_string => \$stdout, + error_to_string => \$stderr, + ); my $exitcode = $? >> 8; is($exitcode, $test->{exitcode}, 'trigger deferred expected exitcode'); diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm index 28df5b14d..b3938e4ca 100644 --- a/scripts/Dpkg/Changelog/Parse.pm +++ b/scripts/Dpkg/Changelog/Parse.pm @@ -159,9 +159,11 @@ sub changelog_parse { $changes = $module->new(); error(g_('changelog format %s is not a Dpkg::Changelog class'), $format) unless $changes->isa('Dpkg::Changelog'); - $changes->set_options(reportfile => $opts{label}, - verbose => $opts{verbose}, - range => $range); + $changes->set_options( + reportfile => $opts{label}, + verbose => $opts{verbose}, + range => $range, + ); # Load and parse the changelog. $changes->load($opts{file}, compression => $opts{compression}) diff --git a/scripts/Dpkg/Compression/FileHandle.pm b/scripts/Dpkg/Compression/FileHandle.pm index 02969593d..f31c6816a 100644 --- a/scripts/Dpkg/Compression/FileHandle.pm +++ b/scripts/Dpkg/Compression/FileHandle.pm @@ -421,8 +421,11 @@ sub _open_for_write { if exists *$self->{mode}; if ($self->use_compression()) { - *$self->{compressor}->compress(from_pipe => \$filehandle, - to_file => $self->get_filename(), %opts); + *$self->{compressor}->compress( + from_pipe => \$filehandle, + to_file => $self->get_filename(), + %opts, + ); } else { CORE::open($filehandle, '>', $self->get_filename) or syserr(g_('cannot write %s'), $self->get_filename()); @@ -439,8 +442,11 @@ sub _open_for_read { if exists *$self->{mode}; if ($self->use_compression()) { - *$self->{compressor}->uncompress(to_pipe => \$filehandle, - from_file => $self->get_filename(), %opts); + *$self->{compressor}->uncompress( + to_pipe => \$filehandle, + from_file => $self->get_filename(), + %opts, + ); *$self->{allow_sigpipe} = 1; } else { CORE::open($filehandle, '<', $self->get_filename) @@ -453,7 +459,9 @@ sub _open_for_read { sub _cleanup { my $self = shift; my $cmdline = *$self->{compressor}{cmdline} // ''; - *$self->{compressor}->wait_end_process(no_check => *$self->{allow_sigpipe}); + *$self->{compressor}->wait_end_process( + no_check => *$self->{allow_sigpipe}, + ); if (*$self->{allow_sigpipe}) { require POSIX; unless (($? == 0) || (POSIX::WIFSIGNALED($?) && diff --git a/scripts/Dpkg/Control/Tests.pm b/scripts/Dpkg/Control/Tests.pm index 0dc67e7d2..b608dfbf2 100644 --- a/scripts/Dpkg/Control/Tests.pm +++ b/scripts/Dpkg/Control/Tests.pm @@ -54,7 +54,10 @@ The options are passed through to the Dpkg::Index->new() constructor. sub new { my ($this, %opts) = @_; my $class = ref($this) || $this; - my $self = Dpkg::Index->new(type => CTRL_TESTS, %opts); + my $self = Dpkg::Index->new( + type => CTRL_TESTS, + %opts, + ); return bless $self, $class; } diff --git a/scripts/Dpkg/Control/Tests/Entry.pm b/scripts/Dpkg/Control/Tests/Entry.pm index 8ef4e71a1..62a6a9feb 100644 --- a/scripts/Dpkg/Control/Tests/Entry.pm +++ b/scripts/Dpkg/Control/Tests/Entry.pm @@ -55,7 +55,10 @@ sub new { my ($this, %opts) = @_; my $class = ref($this) || $this; - my $self = Dpkg::Control->new(type => CTRL_TESTS, %opts); + my $self = Dpkg::Control->new( + type => CTRL_TESTS, + %opts, + ); bless $self, $class; return $self; } diff --git a/scripts/Dpkg/IPC.pm b/scripts/Dpkg/IPC.pm index ac97a7f9c..8e6ec00e7 100644 --- a/scripts/Dpkg/IPC.pm +++ b/scripts/Dpkg/IPC.pm @@ -345,8 +345,11 @@ sub spawn { 'Dpkg::IPC::spawn() option nocheck is deprecated, ' . 'either switch to no_check or pass it alongside it'); } - wait_child($pid, no_check => $opts{no_check} // $opts{nocheck}, - timeout => $opts{timeout}, cmdline => $cmdline); + wait_child($pid, + no_check => $opts{no_check} // $opts{nocheck}, + timeout => $opts{timeout}, + cmdline => $cmdline, + ); return 1; } diff --git a/scripts/Dpkg/Index.pm b/scripts/Dpkg/Index.pm index fe220261f..3c4fc188c 100644 --- a/scripts/Dpkg/Index.pm +++ b/scripts/Dpkg/Index.pm @@ -287,7 +287,11 @@ object. sub new_item { my $self = shift; - return Dpkg::Control->new(%{$self->{item_opts}}, type => $self->{type}); + + return Dpkg::Control->new( + %{$self->{item_opts}}, + type => $self->{type}, + ); } =item $item = $index->get_by_key($key) diff --git a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm index 43f6db472..91f337083 100644 --- a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm +++ b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm @@ -97,8 +97,14 @@ sub _gpg_exec my ($self, @exec) = @_; my ($stdout, $stderr); - spawn(exec => \@exec, wait_child => 1, no_check => 1, timeout => 10, - to_string => \$stdout, error_to_string => \$stderr); + spawn( + exec => \@exec, + wait_child => 1, + no_check => 1, + timeout => 10, + to_string => \$stdout, + error_to_string => \$stderr, + ); if (WIFEXITED($?)) { my $status = WEXITSTATUS($?); print { *STDERR } "$stdout$stderr" if $status; @@ -139,7 +145,10 @@ sub _gpg_verify { push @exec, _gpg_options_weak_digests(); push @exec, '--homedir', $gpg_home; foreach my $cert (@certs) { - my $certring = File::Temp->new(UNLINK => 1, SUFFIX => '.pgp'); + my $certring = File::Temp->new( + UNLINK => 1, + SUFFIX => '.pgp', + ); my $rc; if ($cert =~ m{\.kbx$}) { # Accept GnuPG apparent keybox-format keyrings as-is. diff --git a/scripts/Dpkg/OpenPGP/Backend/SOP.pm b/scripts/Dpkg/OpenPGP/Backend/SOP.pm index af4ccdcca..30ed1c8bc 100644 --- a/scripts/Dpkg/OpenPGP/Backend/SOP.pm +++ b/scripts/Dpkg/OpenPGP/Backend/SOP.pm @@ -73,10 +73,15 @@ sub _sop_exec $io->{out} //= '/dev/null'; my $stderr; - spawn(exec => [ $cmd, @exec ], - wait_child => 1, no_check => 1, timeout => 10, - from_file => $io->{in}, to_file => $io->{out}, - error_to_string => \$stderr); + spawn( + exec => [ $cmd, @exec ], + wait_child => 1, + no_check => 1, + timeout => 10, + from_file => $io->{in}, + to_file => $io->{out}, + error_to_string => \$stderr, + ); if (WIFEXITED($?)) { my $status = WEXITSTATUS($?); print { *STDERR } "$stderr" if $status; diff --git a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm index a41af09bd..822b3fa30 100644 --- a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm +++ b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm @@ -63,9 +63,14 @@ sub _sq_exec my ($self, $cmd, @exec) = @_; my ($stdout, $stderr); - spawn(exec => [ $cmd, @exec ], - wait_child => 1, no_check => 1, timeout => 10, - to_string => \$stdout, error_to_string => \$stderr); + spawn( + exec => [ $cmd, @exec ], + wait_child => 1, + no_check => 1, + timeout => 10, + to_string => \$stdout, + error_to_string => \$stderr, + ); if (WIFEXITED($?)) { my $status = WEXITSTATUS($?); print { *STDERR } "$stdout$stderr" if $status; diff --git a/scripts/Dpkg/Path.pm b/scripts/Dpkg/Path.pm index 785d44e91..90073573f 100644 --- a/scripts/Dpkg/Path.pm +++ b/scripts/Dpkg/Path.pm @@ -285,7 +285,11 @@ sub get_control_path { my $control_file; my @exec = ('dpkg-query', '--control-path', $pkg); push @exec, $filetype if defined $filetype; - spawn(exec => \@exec, wait_child => 1, to_string => \$control_file); + spawn( + exec => \@exec, + wait_child => 1, + to_string => \$control_file, + ); chomp($control_file); if (defined $filetype) { return if $control_file eq ''; diff --git a/scripts/Dpkg/Shlibs/Cppfilt.pm b/scripts/Dpkg/Shlibs/Cppfilt.pm index cb80bb6c4..3a29f0f9a 100644 --- a/scripts/Dpkg/Shlibs/Cppfilt.pm +++ b/scripts/Dpkg/Shlibs/Cppfilt.pm @@ -64,9 +64,11 @@ sub get_cppfilt { last_symbol => '', last_result => '', }; - $filt->{pid} = spawn(exec => [ 'c++filt', "--format=$type" ], - from_pipe => \$filt->{from}, - to_pipe => \$filt->{to}); + $filt->{pid} = spawn( + exec => [ 'c++filt', "--format=$type" ], + from_pipe => \$filt->{from}, + to_pipe => \$filt->{to}, + ); syserr(g_('unable to execute %s'), 'c++filt') unless defined $filt->{from}; $filt->{from}->autoflush(1); @@ -123,9 +125,11 @@ sub terminate_cppfilts { next if not defined $cppfilts{$type}{pid}; close $cppfilts{$type}{from}; close $cppfilts{$type}{to}; - wait_child($cppfilts{$type}{pid}, cmdline => 'c++filt', - no_check => 1, - timeout => 5); + wait_child($cppfilts{$type}{pid}, + cmdline => 'c++filt', + no_check => 1, + timeout => 5, + ); delete $cppfilts{$type}; } } diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm index c1ce2ec38..b664dc52d 100644 --- a/scripts/Dpkg/Shlibs/SymbolFile.pm +++ b/scripts/Dpkg/Shlibs/SymbolFile.pm @@ -465,8 +465,10 @@ sub merge_symbols { $sym = $pattern->create_pattern_match(symbol => $name); } else { # Symbol without any special info as no pattern matched. - $sym = Dpkg::Shlibs::Symbol->new(symbol => $name, - minver => $minver); + $sym = Dpkg::Shlibs::Symbol->new( + symbol => $name, + minver => $minver, + ); } $self->add_symbol($sym, $obj); } diff --git a/scripts/Dpkg/Source/Archive.pm b/scripts/Dpkg/Source/Archive.pm index b217baa26..bff4c648b 100644 --- a/scripts/Dpkg/Source/Archive.pm +++ b/scripts/Dpkg/Source/Archive.pm @@ -150,7 +150,11 @@ sub extract { $spawn_opts{chdir} = $tmpdir; # Prepare stuff that handles the input of tar - $self->ensure_open('r', delete_sig => [ 'PIPE' ]); + $self->ensure_open('r', + delete_sig => [ + 'PIPE', + ], + ); $spawn_opts{from_handle} = $self->get_filehandle(); # Call tar extraction process diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm index f13ccee70..a359ea9a6 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -224,7 +224,11 @@ sub new { format => Dpkg::Source::Format->new(), options => {}, checksums => Dpkg::Checksums->new(), - openpgp => Dpkg::OpenPGP->new(needs => { api => 'verify' }), + openpgp => Dpkg::OpenPGP->new( + needs => { + api => 'verify', + }, + ), }; bless $self, $class; if (exists $opts{options}) { @@ -396,7 +400,10 @@ sub get_basename { 'Source', 'Version'); } my $v = Dpkg::Version->new($f->{'Version'}); - my $vs = $v->as_string(omit_epoch => 1, omit_revision => !$with_revision); + my $vs = $v->as_string( + omit_epoch => 1, + omit_revision => !$with_revision, + ); return $f->{'Source'} . '_' . $vs; } @@ -661,7 +668,8 @@ sub add_file { } $self->{checksums}->add_from_file($filename, key => $fn); $self->{checksums}->export_to_control($self->{fields}, - use_files_for_md5 => 1); + use_files_for_md5 => 1, + ); } sub commit { diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm index 3f823c3cc..837e85600 100644 --- a/scripts/Dpkg/Source/Package/V1.pm +++ b/scripts/Dpkg/Source/Package/V1.pm @@ -267,7 +267,9 @@ sub do_extract { my $patch = File::Spec->catfile($self->{basedir}, $difffile); info(g_('applying %s'), $difffile); my $patch_obj = Dpkg::Source::Patch->new(filename => $patch); - my $analysis = $patch_obj->apply($newdirectory, force_timestamp => 1); + my $analysis = $patch_obj->apply($newdirectory, + force_timestamp => 1, + ); my @files = grep { ! m{^\Q$newdirectory\E/debian/} } sort keys %{$analysis->{filepatched}}; info(g_('upstream files that have been modified: %s'), @@ -437,10 +439,15 @@ sub do_build { DIR => getcwd(), UNLINK => 0, ); - my $tar = Dpkg::Source::Archive->new(filename => $newtar, - compression => compression_guess_from_filename($tarname), - compression_level => $self->{options}{comp_level}); - $tar->create(options => \@tar_ignore, chdir => $tardirbase); + my $tar = Dpkg::Source::Archive->new( + filename => $newtar, + compression => compression_guess_from_filename($tarname), + compression_level => $self->{options}{comp_level}, + ); + $tar->create( + options => \@tar_ignore, + chdir => $tardirbase, + ); $tar->add_directory($tardirname); $tar->finish(); rename($newtar, $tarname) @@ -499,15 +506,19 @@ sub do_build { UNLINK => 0, ); push_exit_handler(sub { unlink($newdiffgz) }); - my $diff = Dpkg::Source::Patch->new(filename => $newdiffgz, - compression => 'gzip', - compression_level => $self->{options}{comp_level}); + my $diff = Dpkg::Source::Patch->new( + filename => $newdiffgz, + compression => 'gzip', + compression_level => $self->{options}{comp_level}, + ); $diff->create(); $diff->add_diff_directory($origdir, $dir, - basedirname => $basedirname, - diff_ignore_regex => $diff_ignore_regex, - options => []); # Force empty set of options to drop the - # default -p option + basedirname => $basedirname, + diff_ignore_regex => $diff_ignore_regex, + # Force empty set of options to drop the default -p option. + options => [], + ); + $diff->finish() || $ur++; pop_exit_handler(); diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index 7c72ce022..b361d8bd7 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -235,8 +235,15 @@ sub do_extract { filename => File::Spec->catfile($self->{basedir}, $tarfile), ); $tar->extract($newdirectory, - options => [ '--anchored', '--no-wildcards-match-slash', - '--exclude', '*/.pc', '--exclude', '.pc' ]); + options => [ + '--anchored', + '--no-wildcards-match-slash', + '--exclude', + '*/.pc', + '--exclude', + '.pc', + ], + ); # The .pc exclusion is only needed for 3.0 (quilt) and to avoid # having an upstream tarball provide a directory with symlinks # that would be blindly followed when applying the patches @@ -269,7 +276,9 @@ sub do_extract { $tar = Dpkg::Source::Archive->new( filename => File::Spec->catfile($self->{basedir}, $debianfile), ); - $tar->extract($newdirectory, in_place => 1); + $tar->extract($newdirectory, + in_place => 1, + ); # Apply patches (in a separate method as it might be overridden) $self->apply_patches($newdirectory, usage => 'unpack') @@ -313,9 +322,13 @@ sub apply_patches { my $path = File::Spec->catfile($dir, 'debian', 'patches', $patch); info(g_('applying %s'), $patch) unless $opts{skip_auto}; my $patch_obj = Dpkg::Source::Patch->new(filename => $path); - $patch_obj->apply($dir, force_timestamp => 1, - timestamp => $timestamp, - add_options => [ '-E' ]); + $patch_obj->apply($dir, + force_timestamp => 1, + timestamp => $timestamp, + add_options => [ + '-E', + ], + ); print { $applied_fh } "$patch\n"; } close($applied_fh); @@ -331,9 +344,15 @@ sub unapply_patches { my $path = File::Spec->catfile($dir, 'debian', 'patches', $patch); info(g_('unapplying %s'), $patch) unless $opts{quiet}; my $patch_obj = Dpkg::Source::Patch->new(filename => $path); - $patch_obj->apply($dir, force_timestamp => 1, verbose => 0, - timestamp => $timestamp, - add_options => [ '-E', '-R' ]); + $patch_obj->apply($dir, + verbose => 0, + force_timestamp => 1, + timestamp => $timestamp, + add_options => [ + '-E', + '-R', + ], + ); } unlink($applied); } @@ -397,8 +416,10 @@ sub prepare_build { # No main orig.tar, create a dummy one my $filename = $self->get_basename() . '.orig.tar.' . $self->{options}{comp_ext}; - my $tar = Dpkg::Source::Archive->new(filename => $filename, - compression_level => $self->{options}{comp_level}); + my $tar = Dpkg::Source::Archive->new( + filename => $filename, + compression_level => $self->{options}{comp_level}, + ); $tar->create(); $tar->finish(); } @@ -409,7 +430,9 @@ sub check_patches_applied { my $applied = File::Spec->catfile($dir, 'debian', 'patches', '.dpkg-source-applied'); unless (-e $applied) { info(g_('patches are not applied, applying them now')); - $self->apply_patches($dir, usage => 'preparation'); + $self->apply_patches($dir, + usage => 'preparation', + ); } } @@ -495,7 +518,10 @@ sub _generate_patch { # Apply all patches except the last automatic one $opts{skip_auto} //= 0; - $self->apply_patches($tmpdir, skip_auto => $opts{skip_auto}, usage => 'build'); + $self->apply_patches($tmpdir, + skip_auto => $opts{skip_auto}, + usage => 'build', + ); # Create a patch my $tmpdiff = File::Temp->new( @@ -504,28 +530,37 @@ sub _generate_patch { UNLINK => 0, ); push_exit_handler(sub { unlink($tmpdiff) }); - my $diff = Dpkg::Source::Patch->new(filename => $tmpdiff, - compression => 'none'); + my $diff = Dpkg::Source::Patch->new( + filename => $tmpdiff, + compression => 'none', + ); $diff->create(); $diff->set_header(sub { if ($opts{header_from} and -e $opts{header_from}) { my $header_from = Dpkg::Source::Patch->new( - filename => $opts{header_from}); - my $analysis = $header_from->analyze($dir, verbose => 0); + filename => $opts{header_from}, + ); + my $analysis = $header_from->analyze($dir, + verbose => 0, + ); return $analysis->{patchheader}; } else { return $self->_get_patch_header($dir); } }); - $diff->add_diff_directory($tmpdir, $dir, basedirname => $basedirname, - %{$self->{diff_options}}, - handle_binary_func => $opts{handle_binary}, - order_from => $opts{order_from}); + $diff->add_diff_directory($tmpdir, $dir, + basedirname => $basedirname, + %{$self->{diff_options}}, + handle_binary_func => $opts{handle_binary}, + order_from => $opts{order_from}, + ); error(g_('unrepresentable changes to source')) if not $diff->finish(); if (-s $tmpdiff) { info(g_('local changes detected, the modified files are:')); - my $analysis = $diff->analyze($dir, verbose => 0); + my $analysis = $diff->analyze($dir, + verbose => 0, + ); foreach my $fn (sort keys %{$analysis->{filepatched}}) { print " $fn\n"; } @@ -581,11 +616,13 @@ sub do_build { # Create a patch my $autopatch = File::Spec->catfile($dir, 'debian', 'patches', $self->get_autopatch_name()); - my $tmpdiff = $self->_generate_patch($dir, order_from => $autopatch, - header_from => $autopatch, - handle_binary => $handle_binary, - skip_auto => $self->{options}{auto_commit}, - usage => 'build'); + my $tmpdiff = $self->_generate_patch($dir, + order_from => $autopatch, + header_from => $autopatch, + handle_binary => $handle_binary, + skip_auto => $self->{options}{auto_commit}, + usage => 'build', + ); unless (-z $tmpdiff or $self->{options}{auto_commit}) { hint(g_('make sure the version in debian/changelog matches ' . 'the unpacked source tree')); @@ -612,9 +649,14 @@ sub do_build { # Create the debian.tar my $debianfile = "$basenamerev.debian.tar." . $self->{options}{comp_ext}; info(g_('building %s in %s'), $sourcepackage, $debianfile); - my $tar = Dpkg::Source::Archive->new(filename => $debianfile, - compression_level => $self->{options}{comp_level}); - $tar->create(options => \@tar_ignore, chdir => $dir); + my $tar = Dpkg::Source::Archive->new( + filename => $debianfile, + compression_level => $self->{options}{comp_level}, + ); + $tar->create( + options => \@tar_ignore, + chdir => $dir, + ); $tar->add_directory('debian'); foreach my $binary ($binaryfiles->get_seen_binaries()) { $tar->add_file($binary) unless $binary =~ m{^debian/}; @@ -647,8 +689,11 @@ Forwarded: not-needed AUTOGEN_HEADER } - my $ch_info = changelog_parse(offset => 0, count => 1, - file => $self->{options}{changelog_file}); + my $ch_info = changelog_parse( + file => $self->{options}{changelog_file}, + offset => 0, + count => 1, + ); return '' if not defined $ch_info; my $header = Dpkg::Control->new(type => CTRL_UNKNOWN); $header->{'Description'} = "<short summary of the patch>\n"; @@ -736,8 +781,10 @@ sub do_commit { }; unless ($tmpdiff) { - $tmpdiff = $self->_generate_patch($dir, handle_binary => $handle_binary, - usage => 'commit'); + $tmpdiff = $self->_generate_patch($dir, + handle_binary => $handle_binary, + usage => 'commit', + ); $binaryfiles->update_debian_source_include_binaries(); } push_exit_handler(sub { unlink($tmpdiff) }); diff --git a/scripts/Dpkg/Source/Package/V3/Bzr.pm b/scripts/Dpkg/Source/Package/V3/Bzr.pm index db8774980..187616168 100644 --- a/scripts/Dpkg/Source/Package/V3/Bzr.pm +++ b/scripts/Dpkg/Source/Package/V3/Bzr.pm @@ -161,9 +161,11 @@ sub do_build { my $debianfile = "$basenamerev.bzr.tar." . $self->{options}{comp_ext}; info(g_('building %s in %s'), $sourcepackage, $debianfile); - my $tar = Dpkg::Source::Archive->new(filename => $debianfile, - compression => $self->{options}{compression}, - compression_level => $self->{options}{comp_level}); + my $tar = Dpkg::Source::Archive->new( + filename => $debianfile, + compression => $self->{options}{compression}, + compression_level => $self->{options}{comp_level}, + ); $tar->create(chdir => $tmpdir); $tar->add_directory($dirname); $tar->finish(); diff --git a/scripts/Dpkg/Source/Package/V3/Native.pm b/scripts/Dpkg/Source/Package/V3/Native.pm index 0d69df34c..00002758c 100644 --- a/scripts/Dpkg/Source/Package/V3/Native.pm +++ b/scripts/Dpkg/Source/Package/V3/Native.pm @@ -127,10 +127,15 @@ sub do_build { push_exit_handler(sub { unlink($newtar) }); my ($dirname, $dirbase) = fileparse($dir); - my $tar = Dpkg::Source::Archive->new(filename => $newtar, - compression => compression_guess_from_filename($tarname), - compression_level => $self->{options}{comp_level}); - $tar->create(options => \@tar_ignore, chdir => $dirbase); + my $tar = Dpkg::Source::Archive->new( + filename => $newtar, + compression => compression_guess_from_filename($tarname), + compression_level => $self->{options}{comp_level}, + ); + $tar->create( + options => \@tar_ignore, + chdir => $dirbase, + ); $tar->add_directory($dirname); $tar->finish(); rename($newtar, $tarname) diff --git a/scripts/Dpkg/Source/Package/V3/Quilt.pm b/scripts/Dpkg/Source/Package/V3/Quilt.pm index abaaa94aa..ac53f9db5 100644 --- a/scripts/Dpkg/Source/Package/V3/Quilt.pm +++ b/scripts/Dpkg/Source/Package/V3/Quilt.pm @@ -247,7 +247,10 @@ sub check_patches_applied { my $patch_obj = Dpkg::Source::Patch->new(filename => $first_patch); return unless $patch_obj->check_apply($dir, fatal_dupes => 1); - $self->apply_patches($dir, usage => 'preparation', verbose => 1); + $self->apply_patches($dir, + usage => 'preparation', + verbose => 1, + ); } sub register_patch { diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm index 8913ad46a..eb735cc24 100644 --- a/scripts/Dpkg/Source/Patch.pm +++ b/scripts/Dpkg/Source/Patch.pm @@ -123,7 +123,10 @@ sub add_diff_file { my $diffgen; my $diff_pid = spawn( exec => [ 'diff', '-u', @options, '--', $old, $new ], - env => { LC_ALL => 'C', TZ => 'UTC0' }, + env => { + LC_ALL => 'C', + TZ => 'UTC0' + }, to_pipe => \$diffgen, ); # Check diff and write it in patch file @@ -152,8 +155,10 @@ sub add_diff_file { print { $self } $_ or syserr(g_('failed to write')); } close($diffgen) or syserr('close on diff pipe'); - wait_child($diff_pid, no_check => 1, - cmdline => "diff -u @options -- $old $new"); + wait_child($diff_pid, + no_check => 1, + cmdline => "diff -u @options -- $old $new", + ); # Verify diff process ended successfully # Exit code of diff: 0 => no difference, 1 => diff ok, 2 => error # Ignore error if binary content detected @@ -276,7 +281,8 @@ sub add_diff_directory { if ($opts{order_from} and -e $opts{order_from}) { my $order_from = Dpkg::Source::Patch->new( - filename => $opts{order_from}); + filename => $opts{order_from}, + ); my $analysis = $order_from->analyze($basedir, verbose => 0); my %patchorder; my $i = 0; @@ -304,9 +310,11 @@ sub add_diff_directory { my ($fn, $mode, $size, $old_file, $new_file, $label_old, $label_new) = @$diff_file; my $success = $self->add_diff_file($old_file, $new_file, - filename => $fn, - label_old => $label_old, - label_new => $label_new, %opts); + filename => $fn, + label_old => $label_old, + label_new => $label_new, + %opts, + ); if ($success and $old_file eq '/dev/null' and $new_file ne '/dev/null') { if (not $size) { @@ -631,8 +639,13 @@ sub apply { spawn( exec => [ $Dpkg::PROGPATCH, @{$opts{options}} ], chdir => $destdir, - env => { LC_ALL => 'C', PATCH_GET => '0' }, - delete_env => [ 'POSIXLY_CORRECT' ], # ensure expected patch behaviour + env => { + LC_ALL => 'C', + PATCH_GET => '0', + }, + delete_env => [ + 'POSIXLY_CORRECT', # ensure expected patch behavior + ], wait_child => 1, no_check => 1, from_handle => $self->get_filehandle(), @@ -691,8 +704,13 @@ sub check_apply { my $patch_pid = spawn( exec => [ $Dpkg::PROGPATCH, @{$opts{options}} ], chdir => $destdir, - env => { LC_ALL => 'C', PATCH_GET => '0' }, - delete_env => [ 'POSIXLY_CORRECT' ], # ensure expected patch behaviour + env => { + LC_ALL => 'C', + PATCH_GET => '0', + }, + delete_env => [ + 'POSIXLY_CORRECT', # ensure expected patch behavior + ], from_handle => $self->get_filehandle(), to_file => '/dev/null', error_to_file => '/dev/null', diff --git a/scripts/Dpkg/Source/Quilt.pm b/scripts/Dpkg/Source/Quilt.pm index 7d3241191..c2365ad35 100644 --- a/scripts/Dpkg/Source/Quilt.pm +++ b/scripts/Dpkg/Source/Quilt.pm @@ -181,12 +181,25 @@ sub push { info(g_('applying %s'), $patch) if $opts{verbose}; eval { - $obj->apply($self->{dir}, timestamp => $opts{timestamp}, - verbose => $opts{verbose}, - force_timestamp => 1, create_dirs => 1, remove_backup => 0, - options => [ '-t', '-F', '0', '-N', '-p1', '-u', - '-V', 'never', '-E', '-b', - '-B', ".pc/$patch/", '--reject-file=-' ]); + $obj->apply($self->{dir}, + verbose => $opts{verbose}, + timestamp => $opts{timestamp}, + force_timestamp => 1, + create_dirs => 1, + remove_backup => 0, + options => [ + '-t', + '-F', '0', + '-N', + '-p1', + '-u', + '-V', 'never', + '-E', + '-b', + '-B', ".pc/$patch/", + '--reject-file=-', + ], + ); }; if ($@) { info(g_('the patch has fuzz which is not allowed, or is malformed')); @@ -221,11 +234,22 @@ sub pop { my $path = $self->get_patch_file($patch); my $obj = Dpkg::Source::Patch->new(filename => $path); - $obj->apply($self->{dir}, timestamp => $opts{timestamp}, - verbose => 0, force_timestamp => 1, remove_backup => 0, - options => [ '-R', '-t', '-N', '-p1', - '-u', '-V', 'never', '-E', - '--no-backup-if-mismatch' ]); + $obj->apply($self->{dir}, + verbose => 0, + timestamp => $opts{timestamp}, + force_timestamp => 1, + remove_backup => 0, + options => [ + '-R', + '-t', + '-N', + '-p1', + '-u', + '-V', 'never', + '-E', + '--no-backup-if-mismatch', + ], + ); } erasedir($backup_dir); diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index d1ca67ada..4c11b71ae 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -809,7 +809,10 @@ if ($signsource) { $buildinfo->load($buildinfo_file); my $checksums = Dpkg::Checksums->new(); $checksums->add_from_control($buildinfo); - $checksums->add_from_file("../$pv.dsc", update => 1, key => "$pv.dsc"); + $checksums->add_from_file("../$pv.dsc", + update => 1, + key => "$pv.dsc", + ); $checksums->export_to_control($buildinfo); $buildinfo->save($buildinfo_file); } diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl index 33c554bf3..f4ae061db 100755 --- a/scripts/dpkg-checkbuilddeps.pl +++ b/scripts/dpkg-checkbuilddeps.pl @@ -118,18 +118,25 @@ unless (defined($bd_value) or defined($bc_value)) { my (@unmet, @conflicts); if ($bd_value) { - my $dep = deps_parse($bd_value, reduce_restrictions => 1, - build_dep => 1, build_profiles => \@build_profiles, - host_arch => $host_arch); + my $dep = deps_parse($bd_value, + reduce_restrictions => 1, + build_dep => 1, + build_profiles => \@build_profiles, + host_arch => $host_arch, + ); error(g_('cannot parse %s field'), 'Build-Depends/Build-Depends-Arch/Build-Depends-Indep') unless defined $dep; push @unmet, build_depends($dep, $facts); } if ($bc_value) { - my $dep = deps_parse($bc_value, reduce_restrictions => 1, union => 1, - build_dep => 1, build_profiles => \@build_profiles, - host_arch => $host_arch); + my $dep = deps_parse($bc_value, + reduce_restrictions => 1, + union => 1, + build_dep => 1, + build_profiles => \@build_profiles, + host_arch => $host_arch, + ); error(g_('cannot parse %s field'), 'Build-Conflicts/Build-Conflicts-Arch/Build-Conflicts-Indep') unless defined $dep; @@ -164,7 +171,11 @@ sub parse_status { $facts->add_installed_package($package, $version, $arch, $multiarch); if (/^Provides: (.*)$/m) { - my $provides = deps_parse($1, reduce_arch => 1, virtual => 1, union => 1); + my $provides = deps_parse($1, + reduce_arch => 1, + virtual => 1, + union => 1, + ); next if not defined $provides; foreach (grep { $_->isa('Dpkg::Deps::Simple') } $provides->get_deps()) diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl index e31fc15c6..cbf2c28e0 100755 --- a/scripts/dpkg-genbuildinfo.pl +++ b/scripts/dpkg-genbuildinfo.pl @@ -150,9 +150,11 @@ sub append_deps { foreach my $dep_str (@deps) { next unless $dep_str; - my $deps = deps_parse($dep_str, reduce_restrictions => 1, - build_dep => 1, - build_profiles => \@build_profiles); + my $deps = deps_parse($dep_str, + reduce_restrictions => 1, + build_dep => 1, + build_profiles => \@build_profiles, + ); # We add every sub-dependencies as we cannot know which package in # an OR dependency has been effectively used. diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index 342ca16f7..2afff9638 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -257,8 +257,12 @@ my $facts = Dpkg::Deps::KnownFacts->new(); $facts->add_installed_package($fields->{'Package'}, $fields->{'Version'}, $fields->{'Architecture'}, $fields->{'Multi-Arch'}); if (exists $pkg->{'Provides'}) { - my $provides = deps_parse($substvars->substvars($pkg->{'Provides'}, no_warn => 1), - reduce_restrictions => 1, virtual => 1, union => 1); + my $provides = deps_parse($substvars->substvars($pkg->{'Provides'}, + no_warn => 1), + reduce_restrictions => 1, + virtual => 1, + union => 1, + ); if (defined $provides) { foreach my $subdep ($provides->get_deps()) { if ($subdep->isa('Dpkg::Deps::Simple')) { @@ -277,20 +281,26 @@ foreach my $field (field_list_pkg_dep()) { if (exists $pkg->{$field}) { my $dep; my $field_value = $substvars->substvars($pkg->{$field}, - msg_prefix => sprintf(g_('%s field of package %s: '), $field, $pkg->{Package})); + msg_prefix => sprintf(g_('%s field of package %s: '), $field, $pkg->{Package}), + ); if (field_get_dep_type($field) eq 'normal') { - $dep = deps_parse($field_value, use_arch => 1, - reduce_arch => $reduce_arch, - reduce_profiles => 1); + $dep = deps_parse($field_value, + use_arch => 1, + reduce_arch => $reduce_arch, + reduce_profiles => 1, + ); error(g_("parsing package '%s' %s field: %s"), $oppackage, $field, $field_value) unless defined $dep; $dep->simplify_deps($facts, @seen_deps); # Remember normal deps to simplify even further weaker deps push @seen_deps, $dep; } else { - $dep = deps_parse($field_value, use_arch => 1, - reduce_arch => $reduce_arch, - reduce_profiles => 1, union => 1); + $dep = deps_parse($field_value, + use_arch => 1, + reduce_arch => $reduce_arch, + reduce_profiles => 1, + union => 1, + ); error(g_("parsing package '%s' %s field: %s"), $oppackage, $field, $field_value) unless defined $dep; $dep->simplify_deps($facts); diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl index 086c4251e..f667a2edd 100755 --- a/scripts/dpkg-gensymbols.pl +++ b/scripts/dpkg-gensymbols.pl @@ -170,8 +170,12 @@ if (not defined($oppackage)) { $oppackage = $packages[0]; } -my $symfile = Dpkg::Shlibs::SymbolFile->new(arch => $host_arch); -my $ref_symfile = Dpkg::Shlibs::SymbolFile->new(arch => $host_arch); +my $symfile = Dpkg::Shlibs::SymbolFile->new( + arch => $host_arch, +); +my $ref_symfile = Dpkg::Shlibs::SymbolFile->new( + arch => $host_arch, +); my @source_symbol_files = ( $input, $output, @@ -240,10 +244,12 @@ $symfile->clear_except(keys %{$od->{objects}}); # Write out symbols files if ($stdout) { $output = g_('<standard output>'); - $symfile->output(\*STDOUT, package => $oppackage, - template_mode => $template_mode, - with_pattern_matches => $verbose_output, - with_deprecated => $verbose_output); + $symfile->output(\*STDOUT, + package => $oppackage, + template_mode => $template_mode, + with_pattern_matches => $verbose_output, + with_deprecated => $verbose_output, + ); } else { unless (defined($output)) { unless ($symfile->is_empty()) { @@ -253,10 +259,12 @@ if ($stdout) { } if (defined($output)) { debug(1, "Storing symbols in $output."); - $symfile->save($output, package => $oppackage, - template_mode => $template_mode, - with_pattern_matches => $verbose_output, - with_deprecated => $verbose_output); + $symfile->save($output, + package => $oppackage, + template_mode => $template_mode, + with_pattern_matches => $verbose_output, + with_deprecated => $verbose_output, + ); } else { debug(1, 'No symbol information to store.'); } @@ -302,15 +310,25 @@ unless ($quiet) { my $file_label; # Compare template symbols files before and after - my $before = File::Temp->new(TEMPLATE => 'dpkg-gensymbolsXXXXXX'); - my $after = File::Temp->new(TEMPLATE => 'dpkg-gensymbolsXXXXXX'); + my $before = File::Temp->new( + TEMPLATE => 'dpkg-gensymbolsXXXXXX', + ); + my $after = File::Temp->new( + TEMPLATE => 'dpkg-gensymbolsXXXXXX', + ); if ($ref_symfile->{file}) { $file_label = $ref_symfile->{file}; } else { $file_label = 'new_symbol_file'; } - $ref_symfile->output($before, package => $oppackage, template_mode => 1); - $symfile->output($after, package => $oppackage, template_mode => 1); + $ref_symfile->output($before, + package => $oppackage, + template_mode => 1, + ); + $symfile->output($after, + package => $oppackage, + template_mode => 1, + ); seek $before, 0, 0; seek $after, 0, 0; diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl index 7fb714846..094a3cff1 100755 --- a/scripts/dpkg-mergechangelogs.pl +++ b/scripts/dpkg-mergechangelogs.pl @@ -222,15 +222,18 @@ sub merge_entries { unless (merge_entry_item('blank_after_changes', $o, $a, $b)) { unshift @result, ''; } - my @merged = merge(defined $o ? $o->get_part('changes') : [], - $a->get_part('changes'), $b->get_part('changes'), - { - CONFLICT => sub { - my ($ca, $cb) = @_; - $exitcode = 1; - return get_conflict_block($ca, $cb); - } - }); + my @merged = merge( + defined $o ? $o->get_part('changes') : [], + $a->get_part('changes'), + $b->get_part('changes'), + { + CONFLICT => sub { + my ($ca, $cb) = @_; + $exitcode = 1; + return get_conflict_block($ca, $cb); + }, + }, + ); unshift @result, @merged; # Merge the header line diff --git a/scripts/dpkg-name.pl b/scripts/dpkg-name.pl index 380df5d37..211f48982 100755 --- a/scripts/dpkg-name.pl +++ b/scripts/dpkg-name.pl @@ -121,7 +121,9 @@ sub getname my $pkg = $fields->{Package}; my $v = Dpkg::Version->new($fields->{Version}); - my $version = $v->as_string(omit_epoch => 1); + my $version = $v->as_string( + omit_epoch => 1, + ); my $type = $fields->{'Package-Type'} || 'deb'; my $tname; diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index 36269ab78..9c8fefc11 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -89,7 +89,9 @@ Options: sub load_override { my $override = shift; - my $comp_file = Dpkg::Compression::FileHandle->new(filename => $override); + my $comp_file = Dpkg::Compression::FileHandle->new( + filename => $override, + ); while (<$comp_file>) { s/\#.*//; @@ -135,7 +137,9 @@ sub load_override sub load_override_extra { my $extra_override = shift; - my $comp_file = Dpkg::Compression::FileHandle->new(filename => $extra_override); + my $comp_file = Dpkg::Compression::FileHandle->new( + filename => $extra_override, + ); while (<$comp_file>) { s/\#.*//; diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl index 6bde4b00b..27baaf5ce 100755 --- a/scripts/dpkg-scansources.pl +++ b/scripts/dpkg-scansources.pl @@ -97,7 +97,9 @@ sub load_override { my $file = shift; local $_; - my $comp_file = Dpkg::Compression::FileHandle->new(filename => $file); + my $comp_file = Dpkg::Compression::FileHandle->new( + filename => $file, + ); while (<$comp_file>) { s/#.*//; next if /^\s*$/; @@ -158,7 +160,9 @@ sub load_src_override { } debug(1, "source override file $file"); - my $comp_file = Dpkg::Compression::FileHandle->new(filename => $file); + my $comp_file = Dpkg::Compression::FileHandle->new( + filename => $file, + ); while (<$comp_file>) { s/#.*//; next if /^\s*$/; @@ -187,7 +191,9 @@ sub load_src_override { sub load_override_extra { my $extra_override = shift; - my $comp_file = Dpkg::Compression::FileHandle->new(filename => $extra_override); + my $comp_file = Dpkg::Compression::FileHandle->new( + filename => $extra_override, + ); while (<$comp_file>) { s/\#.*//; diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index 91cede297..0b32d5b2e 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -210,7 +210,10 @@ foreach my $libdir (@priv_lib_dirs) { my $fields = $control->get_source(); my $bd_value = deps_concat($fields->{'Build-Depends'}, $fields->{'Build-Depends-Arch'}); -my $build_deps = deps_parse($bd_value, build_dep => 1, reduce_restrictions => 1); +my $build_deps = deps_parse($bd_value, + build_dep => 1, + reduce_restrictions => 1, +); error(g_('cannot parse %s field'), 'Build-Depends/Build-Depends-Arch') unless defined $build_deps; @@ -321,7 +324,9 @@ foreach my $file (keys %exec) { # Load symbol information debug(1, "Using symbols file $symfile_path for $soname"); $symfile_cache{$symfile_path} //= - Dpkg::Shlibs::SymbolFile->new(file => $symfile_path); + Dpkg::Shlibs::SymbolFile->new( + file => $symfile_path, + ); $symfile->merge_object_from_symfile($symfile_cache{$symfile_path}, $soname); } if (defined($symfile_path) && $symfile->has_object($soname)) { @@ -555,7 +560,9 @@ if ($stdout) { $varlistfilenew = '-'; } else { $substvars->load($varlistfile) if -e $varlistfile; - $substvars->filter(remove => sub { $_[0] =~ m/^\Q$varnameprefix\E:/ }); + $substvars->filter( + remove => sub { $_[0] =~ m/^\Q$varnameprefix\E:/ }, + ); $varlistfilenew = "$varlistfile.new"; } @@ -994,7 +1001,10 @@ sub find_packages { } } close($dpkg_fh); - wait_child($pid, no_check => 1, cmdline => 'dpkg-query --search'); + wait_child($pid, + no_check => 1, + cmdline => 'dpkg-query --search', + ); return $pkgmatch; } diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 499f55b72..bf653caf7 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -134,7 +134,9 @@ if (defined($options{opmode}) && my $optfile = File::Spec->catfile($dir, 'debian', 'source', $filename); next unless -f $optfile; $conf->load($optfile); - $conf->filter(remove => sub { $_[0] =~ $forbidden_opts_regex->{$filename} }); + $conf->filter( + remove => sub { $_[0] =~ $forbidden_opts_regex->{$filename} }, + ); if (@$conf) { info(g_('using options from %s: %s'), $optfile, join(' ', @$conf)) unless $options{opmode} eq 'print-format'; @@ -257,8 +259,10 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) { } } - my $srcpkg = Dpkg::Source::Package->new(format => $build_format, - options => \%options); + my $srcpkg = Dpkg::Source::Package->new( + format => $build_format, + options => \%options, + ); my $fields = $srcpkg->{fields}; $srcpkg->parse_cmdline_options(@cmdline_options); @@ -283,7 +287,10 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) { } elsif (any { $f eq $_ } field_list_src_dep()) { my $dep; my $type = field_get_dep_type($f); - $dep = deps_parse($v, build_dep => 1, union => $type eq 'union'); + $dep = deps_parse($v, + build_dep => 1, + union => $type eq 'union', + ); error(g_('cannot parse %s field'), $f) unless defined $dep; my $facts = Dpkg::Deps::KnownFacts->new(); $dep->simplify_deps($facts); @@ -449,10 +456,12 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) { # Write the .dsc my $dscname = $srcpkg->get_basename(1) . '.dsc'; info(g_('building %s in %s'), get_source_name(), $dscname); - $srcpkg->write_dsc(filename => $dscname, - remove => \%remove, - override => \%override, - substvars => $substvars); + $srcpkg->write_dsc( + filename => $dscname, + remove => \%remove, + override => \%override, + substvars => $substvars, + ); exit(0); } elsif ($options{opmode} eq 'extract') { # Check command line @@ -470,8 +479,10 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) { } # Create the object that does everything - my $srcpkg = Dpkg::Source::Package->new(filename => $dsc, - options => \%options); + my $srcpkg = Dpkg::Source::Package->new( + filename => $dsc, + options => \%options, + ); # Parse command line options $srcpkg->parse_cmdline_options(@cmdline_options); @@ -543,7 +554,10 @@ sub set_testsuite_triggers_field next unless $test->{Depends}; - my $deps = deps_parse($test->{Depends}, use_arch => 0, tests_dep => 1); + my $deps = deps_parse($test->{Depends}, + use_arch => 0, + tests_dep => 1, + ); deps_iterate($deps, sub { $testdeps{$_[0]->{package}} = 1 }); } diff --git a/scripts/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t index 55520cbca..d1dabf524 100644 --- a/scripts/t/Dpkg_Changelog.t +++ b/scripts/t/Dpkg_Changelog.t @@ -37,7 +37,9 @@ sub setup_changelog my $name = shift; my $file = "$datadir/$name"; - my $changes = Dpkg::Changelog::Debian->new(verbose => 0); + my $changes = Dpkg::Changelog::Debian->new( + verbose => 0, + ); $changes->load($file); my $content = file_slurp($file); @@ -56,13 +58,21 @@ sub setup_changelog my $str; my $oldest_version = $data[-1]->{Version}; - $str = $changes->format_range('dpkg', { since => $oldest_version }); + $str = $changes->format_range('dpkg', + { + since => $oldest_version, + }, + ); $str = $changes->format_range('rfc822'); ok(1, 'TODO check rfc822 output'); - $str = $changes->format_range('rfc822', { since => $oldest_version }); + $str = $changes->format_range('rfc822', + { + since => $oldest_version, + }, + ); ok(1, 'TODO check rfc822 output with ranges'); } @@ -102,135 +112,290 @@ my %ref = ( data => $data, ); -check_options(%ref, range => { count => 3 }, - count => 3, - versions => [ '2:2.0-1', '1:2.0~rc2-3', '1:2.0~rc2-2' ], - name => 'positive count'); -check_options(%ref, range => { count => 3, reverse => 1 }, - count => 3, - versions => [ '1:2.0~rc2-2', '1:2.0~rc2-3', '2:2.0-1' ], - name => 'positive reverse count'); -check_options(%ref, range => { count => -3 }, - count => 3, - versions => [ - '1:2.0~rc2-1sarge2', - '1:2.0~rc2-1sarge1', - '1.5-1', - ], - name => 'negative count'); -check_options(%ref, range => { count => 1 }, - count => 1, - versions => [ '2:2.0-1' ], - name => 'count 1'); -check_options(%ref, range => { count => 1, default_all => 1 }, - count => 1, - versions => [ '2:2.0-1' ], - name => 'count 1 (d_a 1)'); -check_options(%ref, range => { count => -1 }, - count => 1, - versions => [ '1.5-1' ], - name => 'count -1'); +check_options( + %ref, + range => { + count => 3, + }, + count => 3, + versions => [ + '2:2.0-1', + '1:2.0~rc2-3', + '1:2.0~rc2-2', + ], + name => 'positive count', +); +check_options( + %ref, + range => { + count => 3, + reverse => 1, + }, + count => 3, + versions => [ + '1:2.0~rc2-2', + '1:2.0~rc2-3', + '2:2.0-1', + ], + name => 'positive reverse count', +); +check_options( + %ref, + range => { + count => -3, + }, + count => 3, + versions => [ + '1:2.0~rc2-1sarge2', + '1:2.0~rc2-1sarge1', + '1.5-1', + ], + name => 'negative count', +); +check_options( + %ref, + range => { + count => 1, + }, + count => 1, + versions => [ + '2:2.0-1', + ], + name => 'count 1', +); +check_options( + %ref, + range => { + count => 1, + default_all => 1, + }, + count => 1, + versions => [ + '2:2.0-1', + ], + name => 'count 1 (d_a 1)', +); +check_options( + %ref, + range => { + count => -1, + }, + count => 1, + versions => [ + '1.5-1', + ], + name => 'count -1', +); -check_options(%ref, range => { count => 3, offset => 2 }, - count => 3, - versions => [ - '1:2.0~rc2-2', - '1:2.0~rc2-1sarge3', - '1:2.0~rc2-1sarge2', - ], - name => 'positive count + positive offset'); -check_options(%ref, range => { count => -3, offset => 4 }, - count => 3, - versions => [ - '1:2.0~rc2-3', - '1:2.0~rc2-2', - '1:2.0~rc2-1sarge3', - ], - name => 'negative count + positive offset'); +check_options( + %ref, + range => { + count => 3, + offset => 2, + }, + count => 3, + versions => [ + '1:2.0~rc2-2', + '1:2.0~rc2-1sarge3', + '1:2.0~rc2-1sarge2', + ], + name => 'positive count + positive offset', +); +check_options( + %ref, + range => { + count => -3, + offset => 4, + }, + count => 3, + versions => [ + '1:2.0~rc2-3', + '1:2.0~rc2-2', + '1:2.0~rc2-1sarge3', + ], + name => 'negative count + positive offset', +); -check_options(%ref, range => { count => 4, offset => 5 }, - count => 2, - versions => [ '1:2.0~rc2-1sarge1', '1.5-1' ], - name => 'positive count + positive offset (>max)'); -check_options(%ref, range => { count => -4, offset => 2 }, - count => 2, - versions => [ '2:2.0-1', '1:2.0~rc2-3' ], - name => 'negative count + positive offset (<0)'); +check_options( + %ref, + range => { + count => 4, + offset => 5, + }, + count => 2, + versions => [ + '1:2.0~rc2-1sarge1', + '1.5-1', + ], + name => 'positive count + positive offset (>max)', +); +check_options( + %ref, + range => { + count => -4, + offset => 2, + }, + count => 2, + versions => [ + '2:2.0-1', + '1:2.0~rc2-3', + ], + name => 'negative count + positive offset (<0)', +); -check_options(%ref, range => { count => 3, offset => -4 }, - count => 3, - versions => [ - '1:2.0~rc2-1sarge3', - '1:2.0~rc2-1sarge2', - '1:2.0~rc2-1sarge1', - ], - name => 'positive count + negative offset'); -check_options(%ref, range => { count => -3, offset => -3 }, - count => 3, - versions => [ - '1:2.0~rc2-3', - '1:2.0~rc2-2', - '1:2.0~rc2-1sarge3', - ], - name => 'negative count + negative offset'); +check_options( + %ref, + range => { + count => 3, + offset => -4, + }, + count => 3, + versions => [ + '1:2.0~rc2-1sarge3', + '1:2.0~rc2-1sarge2', + '1:2.0~rc2-1sarge1', + ], + name => 'positive count + negative offset', +); +check_options( + %ref, + range => { + count => -3, + offset => -3, + }, + count => 3, + versions => [ + '1:2.0~rc2-3', + '1:2.0~rc2-2', + '1:2.0~rc2-1sarge3', + ], + name => 'negative count + negative offset', +); -check_options(%ref, range => { count => 5, offset => -2 }, - count => 2, - versions => [ '1:2.0~rc2-1sarge1', '1.5-1' ], - name => 'positive count + negative offset (>max)'); -check_options(%ref, range => { count => -5, offset => -4 }, - count => 3, - versions => [ '2:2.0-1', '1:2.0~rc2-3', '1:2.0~rc2-2' ], - name => 'negative count + negative offset (<0)'); +check_options( + %ref, + range => { + count => 5, + offset => -2, + }, + count => 2, + versions => [ + '1:2.0~rc2-1sarge1', + '1.5-1', + ], + name => 'positive count + negative offset (>max)', +); +check_options( + %ref, + range => { + count => -5, + offset => -4, + }, + count => 3, + versions => [ + '2:2.0-1', + '1:2.0~rc2-3', + '1:2.0~rc2-2', + ], + name => 'negative count + negative offset (<0)', +); -check_options(%ref, range => { count => 7 }, - count => 7, - name => 'count 7 (max)'); -check_options(%ref, range => { count => -7 }, - count => 7, - name => 'count -7 (-max)'); -check_options(%ref, range => { count => 10 }, - count => 7, - name => 'count 10 (>max)'); -check_options(%ref, range => { count => -10 }, - count => 7, - name => 'count -10 (<-max)'); +check_options( + %ref, + range => { + count => 7, + }, + count => 7, + name => 'count 7 (max)', +); +check_options( + %ref, + range => { + count => -7, + }, + count => 7, + name => 'count -7 (-max)', +); +check_options( + %ref, + range => { + count => 10, + }, + count => 7, + name => 'count 10 (>max)', +); +check_options( + %ref, + range => { + count => -10, + }, + count => 7, + name => 'count -10 (<-max)', +); -check_options(%ref, range => { from => '1:2.0~rc2-1sarge3' }, - count => 4, - versions => [ - '2:2.0-1', - '1:2.0~rc2-3', - '1:2.0~rc2-2', - '1:2.0~rc2-1sarge3', - ], - name => 'from => "1:2.0~rc2-1sarge3"'); -check_options(%ref, range => { since => '1:2.0~rc2-1sarge3' }, - count => 3, - versions => [ - '2:2.0-1', - '1:2.0~rc2-3', - '1:2.0~rc2-2', - ], - name => 'since => "1:2.0~rc2-1sarge3"'); +check_options( + %ref, + range => { + from => '1:2.0~rc2-1sarge3', + }, + count => 4, + versions => [ + '2:2.0-1', + '1:2.0~rc2-3', + '1:2.0~rc2-2', + '1:2.0~rc2-1sarge3', + ], + name => 'from => "1:2.0~rc2-1sarge3"', +); +check_options( + %ref, + range => { + since => '1:2.0~rc2-1sarge3', + }, + count => 3, + versions => [ + '2:2.0-1', + '1:2.0~rc2-3', + '1:2.0~rc2-2', + ], + name => 'since => "1:2.0~rc2-1sarge3"', +); $SIG{__WARN__} = sub {}; -check_options(%ref, range => { since => 0 }, - count => 7, - name => 'since => 0 returns all'); +check_options( + %ref, + range => { + since => 0, + }, + count => 7, + name => 'since => 0 returns all', +); delete $SIG{__WARN__}; -check_options(%ref, range => { to => '1:2.0~rc2-1sarge2' }, - count => 3, - versions => [ - '1:2.0~rc2-1sarge2', - '1:2.0~rc2-1sarge1', - '1.5-1', - ], - name => 'to => "1:2.0~rc2-1sarge2"'); +check_options( + %ref, + range => { + to => '1:2.0~rc2-1sarge2', + }, + count => 3, + versions => [ + '1:2.0~rc2-1sarge2', + '1:2.0~rc2-1sarge1', + '1.5-1', + ], + name => 'to => "1:2.0~rc2-1sarge2"', +); ## no critic (ControlStructures::ProhibitUntilBlocks) -check_options(%ref, range => { until => '1:2.0~rc2-1sarge2' }, - count => 2, - versions => [ '1:2.0~rc2-1sarge1', '1.5-1' ], - name => 'until => "1:2.0~rc2-1sarge2"'); +check_options( + %ref, + range => { + until => '1:2.0~rc2-1sarge2', + }, + count => 2, + versions => [ + '1:2.0~rc2-1sarge1', + '1.5-1', + ], + name => 'until => "1:2.0~rc2-1sarge2"', +); ## use critic # TODO: test combinations @@ -244,7 +409,11 @@ check_options(%ref, range => { until => '1:2.0~rc2-1sarge2' }, ($changes, $data) = setup_changelog('fields'); -my $str = $changes->format_range('dpkg', { all => 1 }); +my $str = $changes->format_range('dpkg', + { + all => 1, + }, +); my $expected = 'Source: fields Version: 2.0-0etch1 Distribution: stable @@ -287,7 +456,12 @@ if ($vendor eq 'Ubuntu') { } cmp_ok($str, 'eq', $expected, 'fields handling'); -$str = $changes->format_range('dpkg', { offset => 1, count => 2 }); +$str = $changes->format_range('dpkg', + { + offset => 1, + count => 2, + }, +); $expected = 'Source: fields Version: 2.0-1 Distribution: unstable frozen @@ -320,7 +494,12 @@ if ($vendor eq 'Ubuntu') { } cmp_ok($str, 'eq', $expected, 'fields handling 2'); -$str = $changes->format_range('rfc822', { offset => 2, count => 2 }); +$str = $changes->format_range('rfc822', + { + offset => 2, + count => 2, + }, +); $expected = 'Source: fields Version: 2.0~b1-1 Distribution: unstable @@ -406,7 +585,9 @@ is("$f->{Version}", '0', 'version 0 correctly parsed'); foreach my $test (([ "$datadir/misplaced-tz", 6 ], [ "$datadir/unreleased", 5, 7 ])) { my $file = shift @$test; - my $changes = Dpkg::Changelog::Debian->new(verbose => 0); + my $changes = Dpkg::Changelog::Debian->new( + verbose => 0, + ); $changes->load($file); my @errors = $changes->get_parse_errors(); diff --git a/scripts/t/Dpkg_Conf.t b/scripts/t/Dpkg_Conf.t index b1b8bc148..63f7e4765 100644 --- a/scripts/t/Dpkg_Conf.t +++ b/scripts/t/Dpkg_Conf.t @@ -97,7 +97,9 @@ FILTER $conf = Dpkg::Conf->new(allow_short => 1); $conf->load("$datadir/config-mixed"); -$conf->filter(remove => sub { $_[0] =~ m/^--option/ }); +$conf->filter( + remove => sub { $_[0] =~ m/^--option/ }, +); is($conf->output, $expected_filter, 'Filter remove'); $expected_filter = <<'FILTER'; @@ -107,7 +109,9 @@ FILTER $conf = Dpkg::Conf->new(allow_short => 1); $conf->load("$datadir/config-mixed"); -$conf->filter(keep => sub { $_[0] =~ m/^--option-[a-z]+-quotes/ }); +$conf->filter( + keep => sub { $_[0] =~ m/^--option-[a-z]+-quotes/ }, +); is($conf->output, $expected_filter, 'Filter keep'); $expected_filter = <<'FILTER'; @@ -116,6 +120,8 @@ FILTER $conf = Dpkg::Conf->new(allow_short => 1); $conf->load("$datadir/config-mixed"); -$conf->filter(remove => sub { $_[0] =~ m/^--option/ }, - keep => sub { $_[0] =~ m/^--/ }); +$conf->filter( + remove => sub { $_[0] =~ m/^--option/ }, + keep => sub { $_[0] =~ m/^--/ }, +); is($conf->output, $expected_filter, 'Filter keep and remove'); diff --git a/scripts/t/Dpkg_Deps.t b/scripts/t/Dpkg_Deps.t index 5507d4516..54338e9e8 100644 --- a/scripts/t/Dpkg_Deps.t +++ b/scripts/t/Dpkg_Deps.t @@ -81,7 +81,9 @@ is($dep_or2->implies($dep_or1), undef, 'Implication between OR 2/2'); my $dep_ma_host = deps_parse('libcairo2'); my $dep_ma_any = deps_parse('libcairo2:any'); -my $dep_ma_build = deps_parse('libcairo2:native', build_dep => 1); +my $dep_ma_build = deps_parse('libcairo2:native', + build_dep => 1, +); my $dep_ma_explicit = deps_parse('libcairo2:amd64'); is($dep_ma_host->implies($dep_ma_any), undef, 'foo !-> foo:any'); is($dep_ma_build->implies($dep_ma_any), undef, 'foo:native !-> foo:any'); @@ -98,19 +100,34 @@ my $field_tests = 'self, @, @builddeps@'; $SIG{__WARN__} = sub {}; my $dep_tests_fail = deps_parse($field_tests); is($dep_tests_fail, undef, 'normal deps with @ in pkgname'); -$dep_tests_fail = deps_parse($field_tests, build_dep => 1); +$dep_tests_fail = deps_parse($field_tests, + build_dep => 1, +); is($dep_tests_fail, undef, 'build deps with @ in pkgname'); delete $SIG{__WARN__}; -my $dep_tests_pass = deps_parse($field_tests, tests_dep => 1); +my $dep_tests_pass = deps_parse($field_tests, + tests_dep => 1, +); is($dep_tests_pass->output(), $field_tests, 'tests deps with @ in pkgname'); $field_tests = 'self, pkgname:native, @, @builddeps@'; -$dep_tests_pass = deps_parse($field_tests, tests_dep => 1); +$dep_tests_pass = deps_parse($field_tests, + tests_dep => 1, +); is($dep_tests_pass->output(), $field_tests, 'tests deps with :native and @ in pkgname'); my $field_arch = 'libc6 (>= 2.5) [!alpha !hurd-i386], libc6.1 [alpha], libc0.1 [hurd-i386]'; -my $dep_i386 = deps_parse($field_arch, reduce_arch => 1, host_arch => 'i386'); -my $dep_alpha = deps_parse($field_arch, reduce_arch => 1, host_arch => 'alpha'); -my $dep_hurd = deps_parse($field_arch, reduce_arch => 1, host_arch => 'hurd-i386'); +my $dep_i386 = deps_parse($field_arch, + reduce_arch => 1, + host_arch => 'i386', +); +my $dep_alpha = deps_parse($field_arch, + reduce_arch => 1, + host_arch => 'alpha', +); +my $dep_hurd = deps_parse($field_arch, + reduce_arch => 1, + host_arch => 'hurd-i386', +); is($dep_i386->output(), 'libc6 (>= 2.5)', 'Arch reduce 1/3'); is($dep_alpha->output(), 'libc6.1', 'Arch reduce 2/3'); is($dep_hurd->output(), 'libc0.1', 'Arch reduce 3/3'); @@ -127,10 +144,29 @@ my $field_profile = 'dep1 <!stage1 !nocheck>, ' . 'dep12 <!nocheck> <!stage1>, ' . 'dep13 <nocheck> <!stage1>, ' . 'dep14 <nocheck> <stage1>'; -my $dep_noprof = deps_parse($field_profile, reduce_profiles => 1, build_profiles => []); -my $dep_stage1 = deps_parse($field_profile, reduce_profiles => 1, build_profiles => ['stage1']); -my $dep_nocheck = deps_parse($field_profile, reduce_profiles => 1, build_profiles => ['nocheck']); -my $dep_stage1nocheck = deps_parse($field_profile, reduce_profiles => 1, build_profiles => ['stage1', 'nocheck']); +my $dep_noprof = deps_parse($field_profile, + reduce_profiles => 1, + build_profiles => [], +); +my $dep_stage1 = deps_parse($field_profile, + reduce_profiles => 1, + build_profiles => [ + 'stage1', + ], +); +my $dep_nocheck = deps_parse($field_profile, + reduce_profiles => 1, + build_profiles => [ + 'nocheck', + ], +); +my $dep_stage1nocheck = deps_parse($field_profile, + reduce_profiles => 1, + build_profiles => [ + 'stage1', + 'nocheck', + ], +); is($dep_noprof->output(), 'dep1, dep6, dep9, dep10, dep12, dep13', 'Profile reduce 1/4'); is($dep_stage1->output(), 'dep2, dep5, dep7, dep9, dep10, dep11, dep12, dep14', 'Profile reduce 2/4'); is($dep_nocheck->output(), 'dep3, dep6, dep8, dep9, dep11, dep12, dep13, dep14', 'Profile reduce 3/4'); @@ -139,11 +175,11 @@ is($dep_stage1nocheck->output(), 'dep4, dep5, dep7 | dep8, dep10, dep11, dep13, $dep_noprof = deps_parse($field_profile); $dep_noprof->reduce_profiles([]); $dep_stage1 = deps_parse($field_profile); -$dep_stage1->reduce_profiles(['stage1']); +$dep_stage1->reduce_profiles([ 'stage1' ]); $dep_nocheck = deps_parse($field_profile); -$dep_nocheck->reduce_profiles(['nocheck']); +$dep_nocheck->reduce_profiles([ 'nocheck' ]); $dep_stage1nocheck = deps_parse($field_profile); -$dep_stage1nocheck->reduce_profiles(['stage1', 'nocheck']); +$dep_stage1nocheck->reduce_profiles([ 'stage1', 'nocheck' ]); is($dep_noprof->output(), 'dep1, dep6, dep9, dep10, dep12, dep13', 'Profile post-reduce 1/4'); is($dep_stage1->output(), 'dep2, dep5, dep7, dep9, dep10, dep11, dep12, dep14', 'Profile post-reduce 2/4'); is($dep_nocheck->output(), 'dep3, dep6, dep8, dep9, dep11, dep12, dep13, dep14', 'Profile post-reduce 3/4'); @@ -155,7 +191,10 @@ my $field_restrict = 'dep1 <!bootstrap !restrict>, ' . 'dep4 <restrict>, ' . 'dep5 <!bootstrap> <!restrict>, ' . 'dep6 <bootstrap> <restrict>'; -my $dep_restrict = deps_parse($field_restrict, reduce_restrictions => 1, build_profiles => []); +my $dep_restrict = deps_parse($field_restrict, + reduce_restrictions => 1, + build_profiles => [], +); is($dep_restrict->output(), 'dep1, dep3, dep5', 'Unknown restrictions reduce'); $dep_restrict = deps_parse($field_restrict); @@ -253,10 +292,18 @@ $dep_dup->simplify_deps($facts, $dep_opposite); is($dep_dup->output(), 'libc6 (>= 2.6-1), mypackage2, pkg-ma-allowed2', 'Simplify deps'); -my $dep_ma_all_normal_implicit_native = deps_parse('pkg-indep-normal', build_dep => 1); -my $dep_ma_all_normal_explicit_native = deps_parse('pkg-indep-normal:native', build_dep => 1); -my $dep_ma_all_foreign_implicit_native = deps_parse('pkg-indep-foreign', build_dep => 1); -my $dep_ma_all_foreign_explicit_native = deps_parse('pkg-indep-foreign:native', build_dep => 1); +my $dep_ma_all_normal_implicit_native = deps_parse('pkg-indep-normal', + build_dep => 1, +); +my $dep_ma_all_normal_explicit_native = deps_parse('pkg-indep-normal:native', + build_dep => 1, +); +my $dep_ma_all_foreign_implicit_native = deps_parse('pkg-indep-foreign', + build_dep => 1, +); +my $dep_ma_all_foreign_explicit_native = deps_parse('pkg-indep-foreign:native', + build_dep => 1, +); $dep_ma_all_normal_implicit_native->simplify_deps($facts); is($dep_ma_all_normal_implicit_native->output(), '', 'Simplify arch:all m-a:no w/ implicit :native (satisfied)'); @@ -328,11 +375,15 @@ is($dep_virtual->output(), 'myvirtual3 (= 2.0-1)', my $field_dup_union = 'libc6 (>> 2.3), libc6 (>= 2.6-1), fake (<< 2.0), fake(>> 3.0), fake (= 2.5), python (<< 2.5), python (= 2.4)'; -my $dep_dup_union = deps_parse($field_dup_union, union => 1); +my $dep_dup_union = deps_parse($field_dup_union, + union => 1, +); $dep_dup_union->simplify_deps($facts); is($dep_dup_union->output(), 'libc6 (>> 2.3), fake (<< 2.0), fake (>> 3.0), fake (= 2.5), python (<< 2.5)', 'Simplify union deps'); -$dep_dup_union = deps_parse('sipsak (<= 0.9.6-2.1), sipsak (<= 0.9.6-2.2)', union => 1); +$dep_dup_union = deps_parse('sipsak (<= 0.9.6-2.1), sipsak (<= 0.9.6-2.2)', + union => 1, +); $dep_dup_union->simplify_deps($facts); is($dep_dup_union->output(), 'sipsak (<= 0.9.6-2.2)', 'Simplify union deps 2'); @@ -357,7 +408,9 @@ is($dep_profiles->output(), 'tool <!cross> <stage1 cross>', } # TODO -$dep_profiles = deps_parse('libfoo-dev:native <!stage1>, libfoo-dev <!stage1 cross>', build_dep => 1); +$dep_profiles = deps_parse('libfoo-dev:native <!stage1>, libfoo-dev <!stage1 cross>', + build_dep => 1, +); $dep_profiles->simplify_deps($facts); is($dep_profiles->output(), 'libfoo-dev:native <!stage1>, libfoo-dev <!stage1 cross>', @@ -390,7 +443,9 @@ is($dep_version->output(), 'pkg (= 1.0)', 'Simplification merges versions'); my $dep_empty1 = deps_parse(''); is($dep_empty1->output(), '', 'Empty dependency'); -my $dep_empty2 = deps_parse(' , , ', union => 1); +my $dep_empty2 = deps_parse(' , , ', + union => 1, +); is($dep_empty2->output(), '', "' , , ' is also an empty dependency"); # Check sloppy but acceptable dependencies diff --git a/scripts/t/Dpkg_Dist_Files.t b/scripts/t/Dpkg_Dist_Files.t index ca5dca123..43a397d34 100644 --- a/scripts/t/Dpkg_Dist_Files.t +++ b/scripts/t/Dpkg_Dist_Files.t @@ -189,7 +189,9 @@ FILES $dist->reset(); $dist->load("$datadir/files-byhand") or error('cannot parse file'); -$dist->filter(remove => sub { $_[0]->{priority} eq 'optional' }); +$dist->filter( + remove => sub { $_[0]->{priority} eq 'optional' }, +); is($dist->output(), $expected, 'Filter remove priority optional'); $expected = <<'FILES'; @@ -199,7 +201,9 @@ FILES $dist->reset(); $dist->load("$datadir/files-byhand") or error('cannot parse file'); -$dist->filter(keep => sub { $_[0]->{priority} eq 'optional' }); +$dist->filter( + keep => sub { $_[0]->{priority} eq 'optional' }, +); is($dist->output(), $expected, 'Filter keep priority optional'); $expected = <<'FILES'; @@ -208,6 +212,8 @@ FILES $dist->reset(); $dist->load("$datadir/files-byhand") or error('cannot parse file'); -$dist->filter(remove => sub { $_[0]->{section} eq 'text' }, - keep => sub { $_[0]->{priority} eq 'optional' }); +$dist->filter( + remove => sub { $_[0]->{section} eq 'text' }, + keep => sub { $_[0]->{priority} eq 'optional' }, +); is($dist->output(), $expected, 'Filter remove section text, keep priority optional'); diff --git a/scripts/t/Dpkg_Getopt.t b/scripts/t/Dpkg_Getopt.t index d28229194..bcde6b038 100644 --- a/scripts/t/Dpkg_Getopt.t +++ b/scripts/t/Dpkg_Getopt.t @@ -27,11 +27,15 @@ my @expect_argv; @expect_argv = qw(-a -b foo -c var); is_deeply(\@ARGV, \@expect_argv, 'unbundle short options'); -@ARGV = normalize_options(args => [ qw(--option-a --option-b value --option-c=value) ]); +@ARGV = normalize_options( + args => [ qw(--option-a --option-b value --option-c=value) ], +); @expect_argv = qw(--option-a --option-b value --option-c value); is_deeply(\@ARGV, \@expect_argv, 'unbundle long options'); -@ARGV = normalize_options(args => [ qw(-aaa -bbb --option-a=oa -- --opt=arg -dval) ], - delim => '--'); +@ARGV = normalize_options( + args => [ qw(-aaa -bbb --option-a=oa -- --opt=arg -dval) ], + delim => '--', +); @expect_argv = qw(-a aa -b bb --option-a oa -- --opt=arg -dval); is_deeply(\@ARGV, \@expect_argv, 'unbundle options with delimiter'); diff --git a/scripts/t/Dpkg_IPC.t b/scripts/t/Dpkg_IPC.t index 2d238d7a1..c89736278 100644 --- a/scripts/t/Dpkg_IPC.t +++ b/scripts/t/Dpkg_IPC.t @@ -31,17 +31,21 @@ my $string2; file_dump("$tmpfile1", $string1); -my $pid = spawn(exec => 'cat', - from_string => \$string1, - to_string => \$string2); +my $pid = spawn( + exec => 'cat', + from_string => \$string1, + to_string => \$string2, +); ok($pid, 'execute cat program, I/O to variables'); is($string2, $string1, '{from,to}_string'); -$pid = spawn(exec => 'cat', - from_handle => $tmpfile1, - to_handle => $tmpfile2); +$pid = spawn( + exec => 'cat', + from_handle => $tmpfile1, + to_handle => $tmpfile2, +); ok($pid, 'execute cat program, I/O to filehandles'); @@ -51,10 +55,12 @@ $string2 = file_slurp("$tmpfile2"); is($string2, $string1, '{from,to}_handle'); -$pid = spawn(exec => 'cat', - from_file => $tmpfile1, - to_file => $tmpfile2, - wait_child => 1); +$pid = spawn( + exec => 'cat', + from_file => $tmpfile1, + to_file => $tmpfile2, + wait_child => 1, +); ok($pid, 'execute cat program, I/O to filenames and wait'); @@ -63,8 +69,10 @@ $string2 = file_slurp("$tmpfile2"); is($string2, $string1, '{from,to}_file'); eval { - $pid = spawn(exec => ['sleep', '10'], - wait_child => 1, - timeout => 1); + $pid = spawn( + exec => [ 'sleep', '10' ], + wait_child => 1, + timeout => 1, + ); }; ok($@, 'fails on timeout'); diff --git a/scripts/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t index 8faec5803..3a6affd12 100644 --- a/scripts/t/Dpkg_Shlibs.t +++ b/scripts/t/Dpkg_Shlibs.t @@ -114,12 +114,20 @@ is($obj->{SONAME}, 'libc.so.6', 'SONAME'); is($obj->{HASH}, '0x13d99c', 'HASH'); is($obj->{GNU_HASH}, '0x194', 'GNU_HASH'); is($obj->{format}, 'elf32-i386', 'format'); -is_deeply($obj->{flags}, { DYNAMIC => 1, HAS_SYMS => 1, D_PAGED => 1 }, 'flags'); +is_deeply($obj->{flags}, + { + DYNAMIC => 1, + HAS_SYMS => 1, + D_PAGED => 1, + }, + 'flags', +); is_deeply($obj->{NEEDED}, [ 'ld-linux.so.2' ], 'NEEDED'); is_deeply([ $obj->get_needed_libraries ], [ 'ld-linux.so.2' ], 'NEEDED'); $sym = $obj->get_symbol('_sys_nerr@GLIBC_2.3'); -is_deeply($sym, { +is_deeply($sym, + { name => '_sys_nerr', version => 'GLIBC_2.3', soname => 'libc.so.6', @@ -137,7 +145,8 @@ is_deeply($sym, { }, 'Symbol'); $sym = $obj->get_symbol('_IO_stdin_used'); -is_deeply($sym, { +is_deeply($sym, + { name => '_IO_stdin_used', version => '', soname => 'libc.so.6', @@ -164,9 +173,15 @@ is(scalar @syms, 9, 'undefined && dynamic'); use_ok('Dpkg::Shlibs::SymbolFile'); use_ok('Dpkg::Shlibs::Symbol'); -my $sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbol_file.tmp"); -my $sym_file_dup = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbol_file.tmp"); -my $sym_file_old = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbol_file.tmp"); +my $sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbol_file.tmp", +); +my $sym_file_dup = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbol_file.tmp", +); +my $sym_file_old = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbol_file.tmp", +); my $obj_old = load_objdump_obj('libc6-2.3'); @@ -185,7 +200,8 @@ is($sym_file_old->lookup_symbol('__bss_start@Base', ['libc.so.6']), %tmp = $sym_file->lookup_symbol('_errno@GLIBC_2.0', ['libc.so.6'], 1); isa_ok($tmp{symbol}, 'Dpkg::Shlibs::Symbol'); -is_deeply(\%tmp, { +is_deeply(\%tmp, + { symbol => Dpkg::Shlibs::Symbol->new( symbol => '_errno@GLIBC_2.0', minver => '2.3.6.ds1-13', @@ -194,14 +210,16 @@ is_deeply(\%tmp, { ), soname => 'libc.so.6' }, - 'deprecated symbol'); + 'deprecated symbol', +); # Wildcard test my $pat = $sym_file_old->create_symbol('*@GLIBC_PRIVATE 2.3.6.wildcard'); $sym_file_old->add_symbol($pat, 'libc.so.6'); $sym_file_old->merge_symbols($obj, '2.6-1'); $sym = $sym_file_old->lookup_symbol('__nss_services_lookup@GLIBC_PRIVATE', 'libc.so.6'); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => '__nss_services_lookup@GLIBC_PRIVATE', minver => '2.3.6.wildcard', dep_id => 0, @@ -210,10 +228,14 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( symver => undef, optional => undef, }, - tagorder => [ 'symver', 'optional' ], + tagorder => [ + 'symver', + 'optional', + ], matching_pattern => $pat, ), - 'wildcarded symbol'); + 'wildcarded symbol', +); # Save -> Load test use File::Temp; @@ -224,7 +246,9 @@ sub save_load_test { my $save_file = File::Temp->new(); $symfile->save($save_file->filename, @opts); - my $dup = Dpkg::Shlibs::SymbolFile->new(file => $save_file->filename); + my $dup = Dpkg::Shlibs::SymbolFile->new( + file => $save_file->filename, + ); # Force sync of non-stored attributes $dup->{file} = $symfile->{file}; $dup->{arch} = $symfile->{arch}; @@ -243,17 +267,21 @@ save_load_test($sym_file, 'save -> load'); $obj = load_objdump_obj('internal'); # Do not ignore any internal symbols -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbols.internal-filter"); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbols.internal-filter", +); $sym_file->merge_symbols($obj, '100.MISSING'); $sym = $sym_file->lookup_symbol('symbol@Base', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol@Base', minver => '1.0', dep_id => 0, deprecated => 0, ), - 'symbol unaffected w/o including internal symbols'); + 'symbol unaffected w/o including internal symbols', +); $sym = $sym_file->lookup_symbol('.gomp_critical_user_foo@Base', ['libinternal.so.0']); is($sym, undef, 'gomp symbol omitted while filtering internal symbols'); @@ -265,20 +293,25 @@ $sym = $sym_file->lookup_symbol('__aeabi_unknown@GCC_4.0', ['libinternal.so.0']) is($sym, undef, 'unknown aeabi symbol omitted while filtering internal symbols'); # Include internal symbols using the allow-internal tag. -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbols.internal-allow"); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbols.internal-allow", +); $sym_file->merge_symbols($obj, '100.MISSING'); $sym = $sym_file->lookup_symbol('symbol@Base', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol@Base', minver => '1.0', dep_id => 0, deprecated => 0, ), - 'symbol unaffected while including internal symbols via symbol tag'); + 'symbol unaffected while including internal symbols via symbol tag', +); $sym = $sym_file->lookup_symbol('.gomp_critical_user_foo@Base', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => '.gomp_critical_user_foo@Base', minver => '2.0', dep_id => 0, @@ -286,12 +319,16 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { 'allow-internal' => undef, }, - tagorder => [ 'allow-internal' ], + tagorder => [ + 'allow-internal', + ], ), - 'internal gomp symbol included via symbol tag'); + 'internal gomp symbol included via symbol tag', +); $sym = $sym_file->lookup_symbol('__aeabi_lcmp@GCC_3.0', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => '__aeabi_lcmp@GCC_3.0', minver => '3.0', dep_id => 0, @@ -299,12 +336,16 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { 'allow-internal' => undef, }, - tagorder => [ 'allow-internal' ], + tagorder => [ + 'allow-internal', + ], ), - 'internal known aeabi symbol included via symbol tag'); + 'internal known aeabi symbol included via symbol tag', +); $sym = $sym_file->lookup_symbol('__aeabi_unknown@GCC_4.0', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => '__aeabi_unknown@GCC_4.0', minver => '4.0', dep_id => 0, @@ -312,112 +353,141 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { 'allow-internal' => undef, }, - tagorder => [ 'allow-internal' ], + tagorder => [ + 'allow-internal', + ], ), - 'internal unknown aeabi symbol omitted via symbol tag'); + 'internal unknown aeabi symbol omitted via symbol tag', +); # Include internal symbols using the Allow-Internal-Symbol-Groups field -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbols.internal-allow-groups"); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbols.internal-allow-groups", +); $sym_file->merge_symbols($obj, '100.MISSING'); $sym = $sym_file->lookup_symbol('symbol@Base', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol@Base', minver => '1.0', dep_id => 0, deprecated => 0, ), - 'symbol unaffected w/o including internal symbols'); + 'symbol unaffected w/o including internal symbols', +); $sym = $sym_file->lookup_symbol('.gomp_critical_user_foo@Base', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => '.gomp_critical_user_foo@Base', minver => '2.0', dep_id => 0, deprecated => 0, ), - 'internal gomp symbol included via library field'); + 'internal gomp symbol included via library field', +); $sym = $sym_file->lookup_symbol('__aeabi_lcmp@GCC_3.0', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => '__aeabi_lcmp@GCC_3.0', minver => '3.0', dep_id => 0, deprecated => 0, ), - 'internal known aeabi symbol included via library field'); + 'internal known aeabi symbol included via library field', +); $sym = $sym_file->lookup_symbol('__aeabi_unknown@GCC_4.0', ['libinternal.so.0']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => '__aeabi_unknown@GCC_4.0', minver => '4.0', dep_id => 0, deprecated => 0, ), - 'internal unknown aeabi symbol included via library field'); + 'internal unknown aeabi symbol included via library field', +); # Test include mechanism of SymbolFile -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbols.include-1"); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbols.include-1", +); $sym = $sym_file->lookup_symbol('symbol_before@Base', ['libfake.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol_before@Base', minver => '0.9', dep_id => 0, deprecated => 0, ), - 'symbol before include not lost'); + 'symbol before include not lost', +); $sym = $sym_file->lookup_symbol('symbol_after@Base', ['libfake.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol_after@Base', minver => '1.1', dep_id => 0, deprecated => 0, ), - 'symbol after include not lost'); + 'symbol after include not lost', +); $sym = $sym_file->lookup_symbol('symbol1_fake1@Base', ['libfake.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol1_fake1@Base', minver => '1.0', dep_id => 0, deprecated => 0, ), - 'overrides order with #include'); + 'overrides order with #include', +); $sym = $sym_file->lookup_symbol('symbol3_fake1@Base', ['libfake.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol3_fake1@Base', minver => '0', dep_id => 0, deprecated => 0, ), - 'overrides order with #include'); + 'overrides order with #include', +); is($sym_file->get_smallest_version('libfake.so.1'), '0', 'get_smallest_version with null version'); $sym = $sym_file->lookup_symbol('symbol_in_libdivert@Base', ['libdivert.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol_in_libdivert@Base', minver => '1.0~beta1', dep_id => 0, deprecated => 0, ), - '#include can change current object'); + '#include can change current object', +); -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbols.include-2"); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbols.include-2", +); $sym = $sym_file->lookup_symbol('symbol1_fake2@Base', ['libfake.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol1_fake2@Base', minver => '1.0', dep_id => 1, deprecated => 0, ), - 'overrides order with circular #include'); + 'overrides order with circular #include', +); is($sym_file->get_smallest_version('libfake.so.1'), '1.0', 'get_smallest_version'); @@ -427,7 +497,9 @@ my $io; # Check dump output open $io, '>', \$io_data or die "cannot open io string\n"; -$sym_file->output($io, package => 'libfake1'); +$sym_file->output($io, + package => 'libfake1', +); is($io_data, 'libfake.so.1 libfake1 #MINVER# | libvirtualfake @@ -445,8 +517,10 @@ ok($obj->is_public_library(), 'glib-ia64 is a public library'); ok(!$obj->is_executable(), 'glib-ia64 is not an executable'); $sym = $obj->get_symbol('IA__g_free'); -is_deeply($sym, { - name => 'IA__g_free', version => '', +is_deeply($sym, + { + name => 'IA__g_free', + version => '', soname => 'libglib-2.0.so.0', objid => 'libglib-2.0.so.0', section => '.text', @@ -460,7 +534,8 @@ is_deeply($sym, { hidden => '', defined => 1, }, - 'symbol with visibility without version'); + 'symbol with visibility without version', +); # Check parsing of objdump output when symbol names contain spaces $obj = load_objdump_obj('spacesyms'); @@ -470,7 +545,8 @@ sub check_spacesym { $visibility //= ''; $sym = $obj->get_symbol($name . "@" . $version); - is_deeply($sym, { + is_deeply($sym, + { name => $name, version => $version, soname => 'libspacesyms.so.1', @@ -486,7 +562,8 @@ sub check_spacesym { hidden => '', defined => 1, }, - $name); + $name, + ); ok(defined $obj->{dynrelocs}{$name . "@@" . $version}, "dynreloc found for $name"); } @@ -508,8 +585,13 @@ check_spacesym('symshortverSPA CEprotected', 'V1', 'protected'); # Parsing/dumping # Template mode -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/basictags.symbols", arch => 'amd64'); -save_load_test($sym_file, 'template save -> load', template_mode => 1); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/basictags.symbols", + arch => 'amd64', +); +save_load_test($sym_file, 'template save -> load', + template_mode => 1, +); # Dumping in non-template mode (amd64) (test for arch tags) open $io, '>', \$io_data or die "cannot open io string\n"; @@ -527,7 +609,10 @@ is($io_data, # Dumping in non-template mode (mips) (test for arch tags) open $io, '>', \$io_data or die "cannot open io string\n"; -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/basictags.symbols", arch => 'mips'); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/basictags.symbols", + arch => 'mips', +); $sym_file->output($io); is($io_data, 'libbasictags.so.1 libbasictags1 #MINVER# @@ -543,8 +628,14 @@ is($io_data, # Dumping in non-template mode (i386) (test for arch tags) open $io, '>', \$io_data or die "cannot open io string\n"; -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/basictags.symbols", arch => 'i386'); -$sym_file_dup = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/basictags.symbols", arch => 'i386'); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/basictags.symbols", + arch => 'i386', +); +$sym_file_dup = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/basictags.symbols", + arch => 'i386', +); $sym_file->output($io); is($io_data, 'libbasictags.so.1 libbasictags1 #MINVER# @@ -576,7 +667,8 @@ delete $tags_obj_i386->{dynsyms}{'symbol11_optional@Base'}; $sym_file->merge_symbols($tags_obj_i386, '100.MISSING'); $sym = $sym_file->lookup_symbol('symbol11_optional@Base', ['libbasictags.so.1'], 1); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol11_optional@Base', symbol_templ => 'symbol11_optional@Base', minver => '1.1', @@ -585,13 +677,17 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { optional => undef, }, - tagorder => [ 'optional' ], + tagorder => [ + 'optional', + ], ), - 'disappeared optional symbol gets deprecated'); + 'disappeared optional symbol gets deprecated', +); $sym_file->merge_symbols($tags_obj_i386, '101.MISSING'); $sym = $sym_file->lookup_symbol('symbol11_optional@Base', ['libbasictags.so.1'], 1); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol11_optional@Base', symbol_templ => 'symbol11_optional@Base', minver => '1.1', @@ -600,9 +696,12 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { optional => undef, }, - tagorder => [ 'optional' ], + tagorder => [ + 'optional', + ], ), - 'deprecated text of MISSING optional symbol gets rebumped each merge'); + 'deprecated text of MISSING optional symbol gets rebumped each merge', +); is(scalar($sym_file->get_lost_symbols($sym_file_dup)), 0, 'missing optional symbol is not LOST'); @@ -611,7 +710,8 @@ is(scalar($sym_file->get_lost_symbols($sym_file_dup)), 0, $tags_obj_i386->add_dynamic_symbol($symbol11); $sym_file->merge_symbols($tags_obj_i386, '100.MISSING'); $sym = $sym_file->lookup_symbol('symbol11_optional@Base', ['libbasictags.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol11_optional@Base', symbol_templ => 'symbol11_optional@Base', minver => '1.1', @@ -620,9 +720,12 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { optional => undef, }, - tagorder => [ 'optional' ], + tagorder => [ + 'optional', + ], ), - 'reappeared optional symbol gets undeprecated + minver'); + 'reappeared optional symbol gets undeprecated + minver', +); is(scalar($sym_file->get_lost_symbols($sym_file_dup) + $sym_file->get_new_symbols($sym_file_dup)), 0, 'reappeared optional symbol: neither NEW nor LOST'); @@ -633,7 +736,8 @@ my $symbol21 = $tags_obj_amd64->get_symbol('symbol21_amd64@Base'); $tags_obj_i386->add_dynamic_symbol($symbol21); $sym_file->merge_symbols($tags_obj_i386, '100.MISSING'); $sym = $sym_file->lookup_symbol('symbol21_amd64@Base', ['libbasictags.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol21_amd64@Base', symbol_templ => 'symbol21_amd64@Base', symbol_quoted => "'", @@ -641,7 +745,8 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( dep_id => 0, deprecated => 0, ), - 'symbol appears on foreign arch, arch tag should be removed'); + 'symbol appears on foreign arch, arch tag should be removed', +); @tmp = map { $_->{symbol}->get_symbolname() } $sym_file->get_new_symbols($sym_file_dup); is_deeply(\@tmp, [ 'symbol21_amd64@Base' ], 'symbol from foreign arch is NEW'); is($sym->get_symbolspec(1), ' symbol21_amd64@Base 2.1', @@ -656,7 +761,8 @@ delete $tags_obj_i386->{dynsyms}{'symbol41_i386_and_optional@Base'}; $sym_file->merge_symbols($tags_obj_i386, '100.MISSING'); $sym = $sym_file->lookup_symbol('symbol22_i386@Base', ['libbasictags.so.1'], 1); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol22_i386@Base', symbol_templ => 'symbol22_i386@Base', minver => '2.2', @@ -665,11 +771,15 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { arch => '!amd64 !ia64 !mips', }, - tagorder => [ 'arch' ], + tagorder => [ + 'arch', + ], ), - 'disappeared arch specific symbol gets deprecated'); + 'disappeared arch specific symbol gets deprecated', +); $sym = $sym_file->lookup_symbol('symbol24_32@Base', ['libbasictags.so.1'], 1); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol24_32@Base', symbol_templ => 'symbol24_32@Base', minver => '2.4', @@ -678,11 +788,15 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { 'arch-bits' => '32', }, - tagorder => [ 'arch-bits' ], + tagorder => [ + 'arch-bits', + ], ), - 'disappeared arch bits specific symbol gets deprecated'); + 'disappeared arch bits specific symbol gets deprecated', +); $sym = $sym_file->lookup_symbol('symbol26_little@Base', ['libbasictags.so.1'], 1); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol26_little@Base', symbol_templ => 'symbol26_little@Base', minver => '2.6', @@ -691,11 +805,15 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( tags => { 'arch-endian' => 'little', }, - tagorder => [ 'arch-endian' ], + tagorder => [ + 'arch-endian', + ], ), - 'disappeared arch endian specific symbol gets deprecated'); + 'disappeared arch endian specific symbol gets deprecated', +); $sym = $sym_file->lookup_symbol('symbol28_little_32@Base', ['libbasictags.so.1'], 1); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol28_little_32@Base', symbol_templ => 'symbol28_little_32@Base', minver => '2.8', @@ -705,11 +823,16 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( 'arch-bits' => '32', 'arch-endian' => 'little', }, - tagorder => [ 'arch-bits', 'arch-endian' ], + tagorder => [ + 'arch-bits', + 'arch-endian', + ], ), - 'disappeared arch bits and endian specific symbol gets deprecated'); + 'disappeared arch bits and endian specific symbol gets deprecated', +); $sym = $sym_file->lookup_symbol('symbol41_i386_and_optional@Base', ['libbasictags.so.1'], 1); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol41_i386_and_optional@Base', symbol_templ => 'symbol41_i386_and_optional@Base', symbol_quoted => '"', @@ -720,33 +843,48 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( arch => 'i386', optional => 'reason', }, - tagorder => [ 'arch', 'optional' ], + tagorder => [ + 'arch', + 'optional', + ], ), - 'disappeared optional arch specific symbol gets deprecated'); + 'disappeared optional arch specific symbol gets deprecated', +); @tmp = sort map { $_->{symbol}->get_symbolname() } $sym_file->get_lost_symbols($sym_file_dup); -is_deeply(\@tmp, [ +is_deeply(\@tmp, + [ 'symbol22_i386@Base', 'symbol24_32@Base', 'symbol26_little@Base', 'symbol28_little_32@Base', ], - "missing arch specific is LOST, but optional arch specific isn't"); + "missing arch specific is LOST, but optional arch specific isn't", +); # Tests for tagged #includes -$sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/symbols.include-3", arch => 'i386'); +$sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/symbols.include-3", + arch => 'i386', +); $sym = $sym_file->lookup_symbol('symbol2_fake1@Base', ['libbasictags.so.2']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol2_fake1@Base', minver => '1.0', tags => { optional => undef, 'random tag' => 'random value', }, - tagorder => [ 'optional', 'random tag' ], + tagorder => [ + 'optional', + 'random tag', + ], ), - 'symbols from #included file inherits tags'); + 'symbols from #included file inherits tags', +); $sym = $sym_file->lookup_symbol('symbol41_i386_and_optional@Base', ['libbasictags.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol41_i386_and_optional@Base', symbol_templ => 'symbol41_i386_and_optional@Base', symbol_quoted => '"', @@ -756,20 +894,30 @@ is_deeply($sym, Dpkg::Shlibs::Symbol->new( t => 'v', arch => 'i386', }, - tagorder => [ 'optional', 't', 'arch' ], + tagorder => [ + 'optional', + 't', + 'arch', + ], ), - 'symbols in #included file can override tag values'); + 'symbols in #included file can override tag values', +); $sym = $sym_file->lookup_symbol('symbol51_untagged@Base', ['libbasictags.so.1']); -is_deeply($sym, Dpkg::Shlibs::Symbol->new( +is_deeply($sym, + Dpkg::Shlibs::Symbol->new( symbol => 'symbol51_untagged@Base', minver => '5.1', tags => { optional => 'from parent', t => 'v', }, - tagorder => [ 'optional', 't' ], + tagorder => [ + 'optional', + 't', + ], ), - 'symbols are properly cloned when #including'); + 'symbols are properly cloned when #including', +); # Test Symbol::clone() $sym = Dpkg::Shlibs::Symbol->new( @@ -797,7 +945,9 @@ sub load_patterns_obj { } sub load_patterns_symbols { - $sym_file = Dpkg::Shlibs::SymbolFile->new(file => "$datadir/patterns.symbols"); + $sym_file = Dpkg::Shlibs::SymbolFile->new( + file => "$datadir/patterns.symbols", + ); return $sym_file; } @@ -805,7 +955,9 @@ load_patterns_obj(); $sym_file_dup = load_patterns_symbols(); load_patterns_symbols(); -save_load_test($sym_file, 'save -> load test of patterns template', template_mode => 1); +save_load_test($sym_file, 'save -> load test of patterns template', + template_mode => 1, +); isnt($sym_file->get_patterns('libpatterns.so.1'), 0, 'patterns.symbols has patterns'); diff --git a/scripts/t/Dpkg_Source_Patch.t b/scripts/t/Dpkg_Source_Patch.t index c92a62564..6ac2695d5 100644 --- a/scripts/t/Dpkg_Source_Patch.t +++ b/scripts/t/Dpkg_Source_Patch.t @@ -36,7 +36,9 @@ sub test_patch_escape { my $patch = Dpkg::Source::Patch->new(filename => "$datadir/$patchname"); eval { - $patch->apply("$tmpdir/$name-tree", verbose => 0); + $patch->apply("$tmpdir/$name-tree", + verbose => 0, + ); }; ok(rmdir "$tmpdir/$name-out", $desc); } diff --git a/scripts/t/Dpkg_Substvars.t b/scripts/t/Dpkg_Substvars.t index 6904a6974..563f3014d 100644 --- a/scripts/t/Dpkg_Substvars.t +++ b/scripts/t/Dpkg_Substvars.t @@ -283,7 +283,9 @@ var1=Some value var2=Some other value VARS $sf = Dpkg::Substvars->new("$datadir/substvars2"); -$sf->filter(remove => sub { $_[0] =~ m/^prefix:/ }); +$sf->filter( + remove => sub { $_[0] =~ m/^prefix:/ }, +); is($sf->output(), $expected, 'Filter remove variables'); $expected = <<'VARS'; @@ -293,13 +295,17 @@ var1=Some value var2=Some other value VARS $sf = Dpkg::Substvars->new("$datadir/substvars2"); -$sf->filter(keep => sub { $_[0] =~ m/var/ }); +$sf->filter( + keep => sub { $_[0] =~ m/var/ }, +); is($sf->output(), $expected, 'Filter keep variables'); $expected = <<'VARS'; prefix:name6=Bar VARS $sf = Dpkg::Substvars->new("$datadir/substvars2"); -$sf->filter(remove => sub { $_[0] =~ m/var/ }, - keep => sub { $_[0] =~ m/^prefix:/ }); +$sf->filter( + remove => sub { $_[0] =~ m/var/ }, + keep => sub { $_[0] =~ m/^prefix:/ }, +); is($sf->output(), $expected, 'Filter keep and remove variables'); diff --git a/scripts/t/Dpkg_Version.t b/scripts/t/Dpkg_Version.t index 8e65343be..02bd0b485 100644 --- a/scripts/t/Dpkg_Version.t +++ b/scripts/t/Dpkg_Version.t @@ -42,8 +42,12 @@ sub dpkg_vercmp { my ($a, $cmp, $b) = @_; my $stderr; - spawn(exec => [ 'dpkg', '--compare-versions', '--', $a, $cmp, $b ], - error_to_string => \$stderr, wait_child => 1, no_check => 1); + spawn( + exec => [ 'dpkg', '--compare-versions', '--', $a, $cmp, $b ], + error_to_string => \$stderr, + wait_child => 1, + no_check => 1, + ); diag("dpkg --compare-versions error=$?: $stderr") if $? and $? != 256; return $? == 0; diff --git a/scripts/t/dpkg_buildpackage.t b/scripts/t/dpkg_buildpackage.t index 843fae3fe..aa35a06d7 100644 --- a/scripts/t/dpkg_buildpackage.t +++ b/scripts/t/dpkg_buildpackage.t @@ -207,17 +207,21 @@ sub test_build } @hook_names; chdir $dirname; - spawn(exec => [ $ENV{PERL}, "$srcdir/dpkg-buildpackage.pl", - "--admindir=$datadir/dpkgdb", - '--host-arch=amd64', - '--ignore-builtin-builddeps', - '--no-sign', - "--build=$typename", - '--check-command=', - @hook_opts, - ], - error_to_string => \$stderr, - wait_child => 1, no_check => 1); + spawn( + exec => [ + $ENV{PERL}, "$srcdir/dpkg-buildpackage.pl", + "--admindir=$datadir/dpkgdb", + '--host-arch=amd64', + '--ignore-builtin-builddeps', + '--no-sign', + "--build=$typename", + '--check-command=', + @hook_opts, + ], + error_to_string => \$stderr, + wait_child => 1, + no_check => 1, + ); chdir '..'; ok($? == 0, "dpkg-buildpackage --build=$typename succeeded"); diff --git a/scripts/t/dpkg_mergechangelogs.t b/scripts/t/dpkg_mergechangelogs.t index b990a123c..7480ee864 100644 --- a/scripts/t/dpkg_mergechangelogs.t +++ b/scripts/t/dpkg_mergechangelogs.t @@ -29,9 +29,13 @@ my $datadir = "$srcdir/t/dpkg_mergechangelogs"; sub test_merge { my ($expected_file, @options) = @_; my $fh = File::Temp->new(); - spawn(exec => [ $ENV{PERL}, "$srcdir/dpkg-mergechangelogs.pl", @options ], - to_handle => $fh, error_to_file => '/dev/null', - wait_child => 1, no_check => 1); + spawn( + exec => [ $ENV{PERL}, "$srcdir/dpkg-mergechangelogs.pl", @options ], + to_handle => $fh, + error_to_file => '/dev/null', + wait_child => 1, + no_check => 1, + ); my $res = compare($expected_file, $fh->filename); if ($res) { system('diff', '-u', $expected_file, $fh->filename); diff --git a/scripts/t/dpkg_source.t b/scripts/t/dpkg_source.t index 5d7db85ff..ecc79bd0f 100644 --- a/scripts/t/dpkg_source.t +++ b/scripts/t/dpkg_source.t @@ -148,9 +148,12 @@ sub test_build_source my ($name) = shift; my $stderr; - spawn(exec => [ $ENV{PERL}, "$srcdir/dpkg-source.pl", '--build', $name ], - error_to_string => \$stderr, - wait_child => 1, no_check => 1); + spawn( + exec => [ $ENV{PERL}, "$srcdir/dpkg-source.pl", '--build', $name ], + error_to_string => \$stderr, + wait_child => 1, + no_check => 1, + ); ok($? == 0, 'dpkg-source --build succeeded'); diag($stderr) unless $? == 0; @@ -162,22 +165,30 @@ sub test_build_source my $dirname; -$dirname = gen_source('source-name' => 'testsuite', - 'source-version' => 0, - 'control-test' => ''); +$dirname = gen_source( + 'source-name' => 'testsuite', + 'source-version' => 0, + 'control-test' => '', +); test_build_source($dirname); -$dirname = gen_source('source-name' => 'testsuite', - 'source-version' => 1, - 'control-test' => ''); +$dirname = gen_source( + 'source-name' => 'testsuite', + 'source-version' => 1, + 'control-test' => '', +); test_build_source($dirname); -$dirname = gen_source('source-name' => 'testsuite', - 'source-version' => 2, - 'source-testsuite' => 'smokepkgtest, unitpkgtest, funcpkgtest', - 'control-test' => $tmpl_control_tests); +$dirname = gen_source( + 'source-name' => 'testsuite', + 'source-version' => 2, + 'source-testsuite' => 'smokepkgtest, unitpkgtest, funcpkgtest', + 'control-test' => $tmpl_control_tests, +); test_build_source($dirname); -$dirname = gen_source('source-name' => 'testsuite', - 'source-version' => 3); +$dirname = gen_source( + 'source-name' => 'testsuite', + 'source-version' => 3, +); test_build_source($dirname); diff --git a/scripts/t/mk.t b/scripts/t/mk.t index c10973255..811b7be7e 100644 --- a/scripts/t/mk.t +++ b/scripts/t/mk.t @@ -49,8 +49,11 @@ sub test_makefile { $desc //= 'default'; - spawn(exec => [ $Dpkg::PROGMAKE, '-C', $datadir, '-f', $makefile ], - wait_child => 1, no_check => 1); + spawn( + exec => [ $Dpkg::PROGMAKE, '-C', $datadir, '-f', $makefile ], + wait_child => 1, + no_check => 1, + ); ok($? == 0, "makefile $makefile computes all values correctly ($desc)"); } diff --git a/utils/t/update_alternatives.t b/utils/t/update_alternatives.t index d54df9dcf..aba724697 100644 --- a/utils/t/update_alternatives.t +++ b/utils/t/update_alternatives.t @@ -124,8 +124,16 @@ sub call_ua { @cmd = @ua; } - spawn(exec => [ @cmd, @{$params} ], no_check => 1, - wait_child => 1, env => { LC_ALL => 'C', %env }, %opts); + spawn( + exec => [ @cmd, @{$params} ], + env => { + LC_ALL => 'C', + %env, + }, + no_check => 1, + wait_child => 1, + %opts, + ); my $test_id = ''; $test_id = "$opts{test_id}: " if defined $opts{test_id}; if ($opts{expect_failure}) { @@ -272,7 +280,13 @@ sub check_choice { my $output; if (defined $id) { # Check status - call_ua([ '--query', "$main_name" ], to_string => \$output, test_id => $msg); + call_ua( + [ + '--query', "$main_name", + ], + to_string => \$output, + test_id => $msg, + ); my $status = q{}; if ($output =~ /^Status: (.*)$/im) { $status = $1; @@ -284,8 +298,14 @@ sub check_choice { check_link($main_link, "$altdir/$main_name", $msg); check_slaves($id, $msg); } else { - call_ua([ '--query', "$main_name" ], error_to_string => \$output, - expect_failure => 1, test_id => $msg); + call_ua( + [ + '--query', "$main_name", + ], + error_to_string => \$output, + expect_failure => 1, + test_id => $msg, + ); ok($output =~ /no alternatives/, "$msg: bad error message for --query."); # Check that all links have disappeared check_no_link("$altdir/$main_name", $msg); @@ -312,7 +332,9 @@ call_ua_dirs( # ENV_ROOT + defaults call_ua_dirs( - env => { $rootdir_envvar => '/rootdir_env' }, + env => { + $rootdir_envvar => '/rootdir_env' + }, expected => "root=/rootdir_env admdir=/rootdir_env$DEFAULT_ADMINDIR", ); @@ -327,44 +349,60 @@ call_ua_dirs( # ENV_ADMINDIR + options call_ua_dirs( - env => { $admindir_envvar => '/admindir_env' }, + env => { + $admindir_envvar => '/admindir_env', + }, params => [ qw(--root /rootdir_opt) ], expected => "root=/rootdir_opt admdir=/rootdir_opt$DEFAULT_ADMINDIR", ); call_ua_dirs( - env => { $admindir_envvar => '/admindir_env' }, + env => { + $admindir_envvar => '/admindir_env', + }, params => [ qw(--admindir /admindir_opt) ], expected => "root=$DEFAULT_ROOTDIR admdir=/admindir_opt", ); call_ua_dirs( - env => { $admindir_envvar => '/admindir_env' }, + env => { + $admindir_envvar => '/admindir_env', + }, params => [ qw(--root /rootdir_opt --admindir /admindir_opt) ], expected => 'root=/rootdir_opt admdir=/admindir_opt', ); call_ua_dirs( - env => { $admindir_envvar => '/admindir_env' }, + env => { + $admindir_envvar => '/admindir_env', + }, params => [ qw(--admindir /admindir_opt --root /rootdir_opt) ], expected => "root=/rootdir_opt admdir=/rootdir_opt$DEFAULT_ADMINDIR", ); # ENV_ROOT + options call_ua_dirs( - env => { $rootdir_envvar => '/rootdir_env' }, + env => { + $rootdir_envvar => '/rootdir_env', + }, params => [ qw(--root /rootdir_opt) ], expected => "root=/rootdir_opt admdir=/rootdir_opt$DEFAULT_ADMINDIR", ); call_ua_dirs( - env => { $rootdir_envvar => '/rootdir_env' }, + env => { + $rootdir_envvar => '/rootdir_env', + }, params => [ qw(--admindir /admindir_opt) ], expected => 'root=/rootdir_env admdir=/admindir_opt', ); call_ua_dirs( - env => { $rootdir_envvar => '/rootdir_env' }, + env => { + $rootdir_envvar => '/rootdir_env', + }, params => [ qw(--root /rootdir_opt --admindir /admindir_opt) ], expected => 'root=/rootdir_opt admdir=/admindir_opt', ); call_ua_dirs( - env => { $rootdir_envvar => '/rootdir_env' }, + env => { + $rootdir_envvar => '/rootdir_env', + }, params => [ qw(--admindir /admindir_opt --root /rootdir_opt) ], expected => "root=/rootdir_opt admdir=/rootdir_opt$DEFAULT_ADMINDIR", ); @@ -456,12 +494,24 @@ $bindir/slave4 # manual change with --set-selections my $input = "doesntexist auto $paths{date}\ngeneric-test manual $paths{false}\n"; my $output = ''; -call_ua(['--set-selections'], from_string => \$input, - to_string => \$output, test_id => 'manual update with --set-selections'); +call_ua( + [ + '--set-selections', + ], + from_string => \$input, + to_string => \$output, + test_id => 'manual update with --set-selections', +); check_choice(1, 'manual', 'manual update with --set-selections'); $input = "generic-test auto $paths{true}\n"; -call_ua(['--set-selections'], from_string => \$input, - to_string => \$output, test_id => 'auto update with --set-selections'); +call_ua( + [ + '--set-selections', + ], + from_string => \$input, + to_string => \$output, + test_id => 'auto update with --set-selections', +); check_choice(0, 'auto', 'auto update with --set-selections'); # manual change with set set_choice(2, test_id => 'manual update with --set'); @@ -547,56 +597,137 @@ install_choice(0); # test install with garbage admin file cleanup(); system("echo garbage > $admindir/generic-test"); -install_choice(0, error_to_file => '/dev/null', expect_failure => 1); +install_choice(0, + error_to_file => '/dev/null', + expect_failure => 1, +); # test invalid usages cleanup(); install_choice(0); # try to install a slave alternative as new master -call_ua(['--install', "$bindir/testmaster", 'slave1', "$paths{date}", '10'], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/testmaster", 'slave1', "$paths{date}", '10', + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # try to install a master alternative as slave -call_ua(['--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', - '--slave', "$bindir/testslave", 'generic-test', "$paths{true}" ], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', + '--slave', "$bindir/testslave", 'generic-test', "$paths{true}", + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # try to reuse master link in slave -call_ua(['--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', - '--slave', "$bindir/testmaster", 'testslave', "$paths{true}" ], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', + '--slave', "$bindir/testmaster", 'testslave', "$paths{true}", + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # try to reuse links in master alternative -call_ua(['--install', "$bindir/slave1", 'testmaster', "$paths{date}", '10'], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/slave1", 'testmaster', "$paths{date}", '10', + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # try to reuse links in slave alternative -call_ua(['--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', - '--slave', "$bindir/generic-test", 'testslave', "$paths{true}" ], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', + '--slave', "$bindir/generic-test", 'testslave', "$paths{true}", + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # try to reuse slave link in another slave alternative of another choice of # the same main alternative -call_ua(['--install', $main_link, $main_name, "$paths{date}", '10', - '--slave', "$bindir/slave1", 'testslave', "$paths{true}" ], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', $main_link, $main_name, "$paths{date}", '10', + '--slave', "$bindir/slave1", 'testslave', "$paths{true}", + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # lack of absolute filenames in links or file path, non-existing path, -call_ua(['--install', '../testmaster', 'testmaster', "$paths{date}", '10'], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); -call_ua(['--install', "$bindir/testmaster", 'testmaster', './update-alternatives.pl', '10'], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', '../testmaster', 'testmaster', "$paths{date}", '10', + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); +call_ua( + [ + '--install', "$bindir/testmaster", 'testmaster', './update-alternatives.pl', '10', + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # non-existing alternative path -call_ua(['--install', "$bindir/testmaster", 'testmaster', "$bindir/doesntexist", '10'], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/testmaster", 'testmaster', "$bindir/doesntexist", '10', + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # invalid alternative name in master -call_ua(['--install', "$bindir/testmaster", 'test/master', "$paths{date}", '10'], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/testmaster", 'test/master', "$paths{date}", '10', + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # invalid alternative name in slave -call_ua(['--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', - '--slave', "$bindir/testslave", 'test slave', "$paths{true}" ], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', + '--slave', "$bindir/testslave", 'test slave', "$paths{true}", + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # install in non-existing dir should fail -call_ua(['--install', "$bindir/doesntexist/testmaster", 'testmaster', "$paths{date}", '10', - '--slave', "$bindir/testslave", 'testslave', "$paths{true}" ], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); -call_ua(['--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', - '--slave', "$bindir/doesntexist/testslave", 'testslave', "$paths{true}" ], - expect_failure => 1, to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/doesntexist/testmaster", 'testmaster', "$paths{date}", '10', + '--slave', "$bindir/testslave", 'testslave', "$paths{true}", + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); +call_ua( + [ + '--install', "$bindir/testmaster", 'testmaster', "$paths{date}", '10', + '--slave', "$bindir/doesntexist/testslave", 'testslave', "$paths{true}", + ], + expect_failure => 1, + to_file => '/dev/null', + error_to_file => '/dev/null', +); # non-existing alternative path in slave is not a failure my $old_path = $choices[0]{slaves}[0]{path}; @@ -627,7 +758,7 @@ ok(!-l "$bindir/slave1", 'install preserves files that should be slave links'); remove_choice(0); ok(-f $main_link, 'removal keeps real file installed as master link'); ok(-f "$bindir/slave1", 'removal keeps real files installed as slave links'); -install_choice(0, params => ['--force']); +install_choice(0, params => [ '--force' ]); check_choice(0, 'auto', 'install --force replaces files with links'); # test management of pre-existing files #2 @@ -649,7 +780,7 @@ ok(!-l $main_link, 'auto switching preserves files that should be links'); ok(!-l "$bindir/slave2", 'auto switching preserves files that should be slave links'); ok(-f $main_link, 'auto switching keeps real file installed as master link'); ok(-f "$bindir/slave2", 'auto switching keeps real files installed as slave links'); -remove_all_choices(params => ['--force']); +remove_all_choices(params => [ '--force' ]); ok(!-e "$bindir/slave2", 'forced removeall drops real files installed as slave links'); # test management of pre-existing files #3 @@ -667,18 +798,22 @@ ok(!-l $main_link, 'install + switching preserves files that should be links'); ok(!-l "$bindir/slave2", 'install + switching preserves files that should be slave links'); ok(-f $main_link, 'install + switching keeps real file installed as master link'); ok(-f "$bindir/slave2", 'install + switching keeps real files installed as slave links'); -set_choice(1, params => ['--force']); +set_choice(1, params => [ '--force' ]); ok(!-e "$bindir/slave2", 'forced switching w/o slave drops real files installed as slave links'); check_choice(1, 'manual', 'set --force replaces files with links'); # check disappearence of obsolete slaves (#916799) cleanup(); -call_ua([ - '--install', "$bindir/test-obsolete", 'test-obsolete', "$paths{date}", '10', - '--slave', "$bindir/test-slave-a", 'test-slave-a', "$bindir/impl-slave-a", - '--slave', "$bindir/test-slave-b", 'test-slave-b', "$bindir/impl-slave-b", - '--slave', "$bindir/test-slave-c", 'test-slave-c', "$bindir/impl-slave-c", -], to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/test-obsolete", 'test-obsolete', "$paths{date}", '10', + '--slave', "$bindir/test-slave-a", 'test-slave-a', "$bindir/impl-slave-a", + '--slave', "$bindir/test-slave-b", 'test-slave-b', "$bindir/impl-slave-b", + '--slave', "$bindir/test-slave-c", 'test-slave-c', "$bindir/impl-slave-c", + ], + to_file => '/dev/null', + error_to_file => '/dev/null', +); my $content; my $expected; @@ -703,10 +838,14 @@ $bindir/impl-slave-c "; is($content, $expected, 'administrative file for non-obsolete slaves is as expected'); -call_ua([ - '--install', "$bindir/test-obsolete", 'test-obsolete', "$paths{date}", '20', - '--slave', "$bindir/test-slave-c", 'test-slave-c', "$bindir/impl-slave-c", -], to_file => '/dev/null', error_to_file => '/dev/null'); +call_ua( + [ + '--install', "$bindir/test-obsolete", 'test-obsolete', "$paths{date}", '20', + '--slave', "$bindir/test-slave-c", 'test-slave-c', "$bindir/impl-slave-c", + ], + to_file => '/dev/null', + error_to_file => '/dev/null', +); $content = file_slurp("$admindir/test-obsolete"); $expected = -- Dpkg.Org's dpkg
