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=e1cd4e06dae34f1864f145382295ae6a0c6bde69 commit e1cd4e06dae34f1864f145382295ae6a0c6bde69 Author: Guillem Jover <[email protected]> AuthorDate: Sun Aug 24 23:02:19 2025 +0200 Dpkg::IPC: Deprecate nocheck option and rename it to no_check This unifies the option name with the rest of similar negated option names. The nocheck option will emit a deprecation warnings. But for backwards compatibility, the nocheck option can still be passed alongside no_check, which will disable the deprecation warning, as the new option will be used instead (now and in the future when the old option gets obsoleted). --- lib/dpkg/t/t-tarextract.t | 2 +- lib/dpkg/t/t-treewalk.t | 2 +- lib/dpkg/t/t-trigdeferred.t | 2 +- scripts/Dpkg/BuildTypes.pm | 8 +++--- scripts/Dpkg/Compression/FileHandle.pm | 2 +- scripts/Dpkg/Compression/Process.pm | 2 +- scripts/Dpkg/IPC.pm | 43 +++++++++++++++++++++++++++++---- scripts/Dpkg/OpenPGP/Backend/GnuPG.pm | 2 +- scripts/Dpkg/OpenPGP/Backend/SOP.pm | 2 +- scripts/Dpkg/OpenPGP/Backend/Sequoia.pm | 2 +- scripts/Dpkg/Shlibs/Cppfilt.pm | 2 +- scripts/Dpkg/Source/Package.pm | 2 +- scripts/Dpkg/Source/Patch.pm | 6 ++--- scripts/dpkg-buildpackage.pl | 2 +- scripts/dpkg-genbuildinfo.pl | 4 +-- scripts/dpkg-shlibdeps.pl | 2 +- scripts/t/Dpkg_BuildTypes.t | 16 ++++++------ scripts/t/Dpkg_Version.t | 2 +- scripts/t/dpkg_buildpackage.t | 4 +-- scripts/t/dpkg_buildtree.t | 2 +- scripts/t/dpkg_mergechangelogs.t | 2 +- scripts/t/dpkg_source.t | 2 +- scripts/t/mk.t | 2 +- utils/t/update_alternatives.t | 2 +- 24 files changed, 75 insertions(+), 42 deletions(-) diff --git a/lib/dpkg/t/t-tarextract.t b/lib/dpkg/t/t-tarextract.t index f25be02c5..4e4d99f0c 100755 --- a/lib/dpkg/t/t-tarextract.t +++ b/lib/dpkg/t/t-tarextract.t @@ -148,7 +148,7 @@ TAR $expected =~ s/\n^.*symlink-long.*$//mg if $type eq 'ustar'; spawn(exec => [ "$builddir/t/c-tarextract", "$dirtree.tar" ], - nocheck => 1, to_string => \$stdout, to_error => \$stderr); + 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 f0aa01844..be9acb51d 100755 --- a/lib/dpkg/t/t-treewalk.t +++ b/lib/dpkg/t/t-treewalk.t @@ -143,7 +143,7 @@ sub test_treewalker { $ENV{TREEWALK_SKIP} = $type eq 'skip' ? "$dirtree/cccc" : undef; spawn(exec => [ "$builddir/t/c-treewalk", $dirtree ], - nocheck => 1, to_string => \$stdout, to_error => \$stderr); + 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 b9eaebd79..a96ec5866 100755 --- a/lib/dpkg/t/t-trigdeferred.t +++ b/lib/dpkg/t/t-trigdeferred.t @@ -98,7 +98,7 @@ sub test_trigdeferred { file_dump("$admindir/triggers/Unincorp", $test->{original}); spawn(exec => [ "$builddir/t/c-trigdeferred", $admindir ], - nocheck => 1, to_string => \$stdout, error_to_string => \$stderr); + 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/BuildTypes.pm b/scripts/Dpkg/BuildTypes.pm index c22fe62c9..895e0a036 100644 --- a/scripts/Dpkg/BuildTypes.pm +++ b/scripts/Dpkg/BuildTypes.pm @@ -189,7 +189,7 @@ Set the current build type to $build_type, which was specified via the $build_option command-line option. The function will check and abort on incompatible build type assignments, -this behavior can be disabled by using the boolean option "nocheck". +this behavior can be disabled by using the boolean option "no_check". =cut @@ -198,7 +198,7 @@ sub set_build_type my ($build_type, $build_option, %opts) = @_; usageerr(g_('cannot combine %s and %s'), $current_option, $build_option) - if not $opts{nocheck} and + if not $opts{no_check} and build_has_none(BUILD_DEFAULT) and $current_type != $build_type; $current_type = $build_type; @@ -211,7 +211,7 @@ Set the current build type from a list of comma-separated build type components. The function will check and abort on incompatible build type assignments, -this behavior can be disabled by using the boolean option "nocheck". +this behavior can be disabled by using the boolean option "no_check". =cut @@ -235,7 +235,7 @@ Set the current build type from a list of comma-separated build target components. The function will check and abort on incompatible build type assignments, -this behavior can be disabled by using the boolean option "nocheck". +this behavior can be disabled by using the boolean option "no_check". =cut diff --git a/scripts/Dpkg/Compression/FileHandle.pm b/scripts/Dpkg/Compression/FileHandle.pm index 429f6268d..02969593d 100644 --- a/scripts/Dpkg/Compression/FileHandle.pm +++ b/scripts/Dpkg/Compression/FileHandle.pm @@ -453,7 +453,7 @@ sub _open_for_read { sub _cleanup { my $self = shift; my $cmdline = *$self->{compressor}{cmdline} // ''; - *$self->{compressor}->wait_end_process(nocheck => *$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/Compression/Process.pm b/scripts/Dpkg/Compression/Process.pm index 701be11c1..97c4c8794 100644 --- a/scripts/Dpkg/Compression/Process.pm +++ b/scripts/Dpkg/Compression/Process.pm @@ -201,7 +201,7 @@ sub uncompress { Call Dpkg::IPC::wait_child() to wait until the sub-process has exited and verify its return code. Any given option will be forwarded to -the wait_child() function. Most notably you can use the "nocheck" option +the wait_child() function. Most notably you can use the "no_check" option to verify the return code yourself instead of letting wait_child() do it for you. diff --git a/scripts/Dpkg/IPC.pm b/scripts/Dpkg/IPC.pm index 686529c8f..ac97a7f9c 100644 --- a/scripts/Dpkg/IPC.pm +++ b/scripts/Dpkg/IPC.pm @@ -30,7 +30,7 @@ from you. =cut -package Dpkg::IPC 1.02; +package Dpkg::IPC 1.03; use v5.36; @@ -106,10 +106,17 @@ C<wait_child> option. Scalar. If containing a true value, wait_child() will be called before returning. The return value of spawn() will be a true value, not the pid. -=item B<nocheck> +=item B<no_check> Scalar. Option of the wait_child() call. +=item B<nocheck> + +Deprecated alias for no_check. +It emits a deprecation warning, but if it is required for backwards +compatibility it can be passed alongside B<no_check> and the warning +will not be emitted. + =item B<timeout> Scalar. Option of the wait_child() call. @@ -332,7 +339,13 @@ sub spawn { $cmdline = "$_=\"" . $opts{env}{$_} . "\" $cmdline"; } } - wait_child($pid, nocheck => $opts{nocheck}, + # TODO: Backwards compatibility, to be removed in VERSION 2.00. + if (exists $opts{nocheck} && ! exists $opts{no_check}) { + warnings::warnif('deprecated', + '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); return 1; } @@ -357,12 +370,19 @@ Options: String to identify the child process in error messages. Defaults to "child process". -=item nocheck +=item no_check If true do not check the return status of the child (and thus do not fail it has been killed or if it exited with a non-zero return code). +=item nocheck + +Deprecated alias for no_check. +It emits a deprecation warning, but if it is required for backwards +compatibility it can be passed alongside B<no_check> and the warning +will not be emitted. + =item timeout Set a maximum time to wait for the process, after that kill the process and @@ -375,6 +395,13 @@ fail with an error message. sub wait_child { my ($pid, %opts) = @_; $opts{cmdline} //= g_('child process'); + # TODO: Backwards compatibility, to be removed in VERSION 2.00. + if (exists $opts{nocheck} && ! exists $opts{no_check}) { + warnings::warnif('deprecated', + 'Dpkg::IPC::wait_child() option nocheck is deprecated, ' . + 'either switch to no_check or pass it alongside it'); + } + $opts{no_check} //= $opts{nocheck}; croak 'no PID set, cannot wait end of process' unless $pid; eval { local $SIG{ALRM} = sub { die "alarm\n" }; @@ -390,7 +417,7 @@ sub wait_child { $opts{timeout}), $opts{cmdline}, $opts{timeout}); } - unless ($opts{nocheck}) { + unless ($opts{no_check}) { subprocerr($opts{cmdline}) if $?; } } @@ -401,6 +428,12 @@ sub wait_child { =head1 CHANGES +=head2 Version 1.03 (dpkg 1.23.0) + +New options: spawn() and wait_child() now accept 'no_check'. + +Deprecated options: 'nocheck' in spawn() and wait_child(). + =head2 Version 1.02 (dpkg 1.18.0) Change options: wait_child() now kills the process when reaching the 'timeout'. diff --git a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm index 077c1586a..19e951aff 100644 --- a/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm +++ b/scripts/Dpkg/OpenPGP/Backend/GnuPG.pm @@ -97,7 +97,7 @@ sub _gpg_exec my ($self, @exec) = @_; my ($stdout, $stderr); - spawn(exec => \@exec, wait_child => 1, nocheck => 1, timeout => 10, + spawn(exec => \@exec, wait_child => 1, no_check => 1, timeout => 10, to_string => \$stdout, error_to_string => \$stderr); if (WIFEXITED($?)) { my $status = WEXITSTATUS($?); diff --git a/scripts/Dpkg/OpenPGP/Backend/SOP.pm b/scripts/Dpkg/OpenPGP/Backend/SOP.pm index ab2150c38..af4ccdcca 100644 --- a/scripts/Dpkg/OpenPGP/Backend/SOP.pm +++ b/scripts/Dpkg/OpenPGP/Backend/SOP.pm @@ -74,7 +74,7 @@ sub _sop_exec $io->{out} //= '/dev/null'; my $stderr; spawn(exec => [ $cmd, @exec ], - wait_child => 1, nocheck => 1, timeout => 10, + wait_child => 1, no_check => 1, timeout => 10, from_file => $io->{in}, to_file => $io->{out}, error_to_string => \$stderr); if (WIFEXITED($?)) { diff --git a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm index 521cdeeb1..a41af09bd 100644 --- a/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm +++ b/scripts/Dpkg/OpenPGP/Backend/Sequoia.pm @@ -64,7 +64,7 @@ sub _sq_exec my ($stdout, $stderr); spawn(exec => [ $cmd, @exec ], - wait_child => 1, nocheck => 1, timeout => 10, + wait_child => 1, no_check => 1, timeout => 10, to_string => \$stdout, error_to_string => \$stderr); if (WIFEXITED($?)) { my $status = WEXITSTATUS($?); diff --git a/scripts/Dpkg/Shlibs/Cppfilt.pm b/scripts/Dpkg/Shlibs/Cppfilt.pm index c0be8e857..cb80bb6c4 100644 --- a/scripts/Dpkg/Shlibs/Cppfilt.pm +++ b/scripts/Dpkg/Shlibs/Cppfilt.pm @@ -124,7 +124,7 @@ sub terminate_cppfilts { close $cppfilts{$type}{from}; close $cppfilts{$type}{to}; wait_child($cppfilts{$type}{pid}, cmdline => 'c++filt', - nocheck => 1, + no_check => 1, timeout => 5); delete $cppfilts{$type}; } diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm index a57e50be9..d8d456c95 100644 --- a/scripts/Dpkg/Source/Package.pm +++ b/scripts/Dpkg/Source/Package.pm @@ -685,7 +685,7 @@ sub write_dsc { $fields->{$f} = $opts{override}{$f}; } - unless ($opts{nocheck}) { + unless ($opts{no_check}) { foreach my $f (qw(Source Version Architecture)) { unless (defined($fields->{$f})) { error(g_('missing information for critical output field %s'), $f); diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm index 3e2413047..7340ef003 100644 --- a/scripts/Dpkg/Source/Patch.pm +++ b/scripts/Dpkg/Source/Patch.pm @@ -152,7 +152,7 @@ sub add_diff_file { print { $self } $_ or syserr(g_('failed to write')); } close($diffgen) or syserr('close on diff pipe'); - wait_child($diff_pid, nocheck => 1, + 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 @@ -626,7 +626,7 @@ sub apply { env => { LC_ALL => 'C', PATCH_GET => '0' }, delete_env => [ 'POSIXLY_CORRECT' ], # ensure expected patch behaviour wait_child => 1, - nocheck => 1, + no_check => 1, from_handle => $self->get_filehandle(), to_string => \$stdout, error_to_string => \$stderr, @@ -689,7 +689,7 @@ sub check_apply { to_file => '/dev/null', error_to_file => '/dev/null', ); - wait_child($patch_pid, nocheck => 1); + wait_child($patch_pid, no_check => 1); my $exit = WEXITSTATUS($?); subprocerr("$Dpkg::PROGPATCH --dry-run") unless WIFEXITED($?); $self->close(); diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl index 4cece1e83..d1ca67ada 100755 --- a/scripts/dpkg-buildpackage.pl +++ b/scripts/dpkg-buildpackage.pl @@ -425,7 +425,7 @@ while (@ARGV) { if (@call_target) { my $targets = join ',', @call_target; - set_build_type_from_targets($targets, '--rules-target', nocheck => 1); + set_build_type_from_targets($targets, '--rules-target', no_check => 1); } if (build_has_all(BUILD_BINARY)) { diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl index c6b380128..641353125 100755 --- a/scripts/dpkg-genbuildinfo.pl +++ b/scripts/dpkg-genbuildinfo.pl @@ -287,7 +287,7 @@ sub is_cross_executable { to_string => \$stdout, error_to_string => \$stderr, wait_child => 1, - nocheck => 1, + no_check => 1, ); if ($?) { print { *STDOUT } $stdout; @@ -304,7 +304,7 @@ sub is_cross_executable { error_to_file => '/dev/null', to_string => \$stdout, wait_child => 1, - nocheck => 1, + no_check => 1, ); return 1 if $? == 0 && $stdout eq 'ok'; diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl index cf5fc4953..5478648ae 100755 --- a/scripts/dpkg-shlibdeps.pl +++ b/scripts/dpkg-shlibdeps.pl @@ -987,7 +987,7 @@ sub find_packages { } } close($dpkg_fh); - wait_child($pid, nocheck => 1, cmdline => 'dpkg-query --search'); + wait_child($pid, no_check => 1, cmdline => 'dpkg-query --search'); return $pkgmatch; } diff --git a/scripts/t/Dpkg_BuildTypes.t b/scripts/t/Dpkg_BuildTypes.t index 7a618562e..26eebcbea 100644 --- a/scripts/t/Dpkg_BuildTypes.t +++ b/scripts/t/Dpkg_BuildTypes.t @@ -31,15 +31,15 @@ ok(build_is(BUILD_DEFAULT | BUILD_BINARY), 'build is default binary'); set_build_type(BUILD_SOURCE | BUILD_ARCH_INDEP, '--build=source,all'); is(get_build_options_from_type(), 'source,all', 'build is source,all'); -set_build_type_from_options('any,all', '--build=any,all', nocheck => 1); +set_build_type_from_options('any,all', '--build=any,all', no_check => 1); is(get_build_options_from_type(), 'binary', 'build is binary from any,all'); ok(build_is(BUILD_BINARY), 'build is any,all'); -set_build_type_from_options('binary', '--build=binary', nocheck => 1); +set_build_type_from_options('binary', '--build=binary', no_check => 1); is(get_build_options_from_type(), 'binary', 'build is binary'); ok(build_is(BUILD_BINARY), 'build is binary'); -set_build_type_from_options('source,all', '--build=source,all', nocheck => 1); +set_build_type_from_options('source,all', '--build=source,all', no_check => 1); ok(build_is(BUILD_SOURCE | BUILD_ARCH_INDEP), 'build source,all is source,all'); ok(!build_is(BUILD_SOURCE | BUILD_ARCH_DEP), 'build source,all is not source,any'); ok(build_has_any(BUILD_SOURCE), 'build source,all has_any source'); @@ -52,17 +52,17 @@ ok(!build_has_all(BUILD_SOURCE | BUILD_ARCH_DEP), ok(!build_has_all(BUILD_FULL), 'build source,all has_all full'); set_build_type_from_targets('build-arch,build-indep', - '--targets=build-arch,build-indep', nocheck => 1); + '--targets=build-arch,build-indep', no_check => 1); is(get_build_options_from_type(), 'binary', 'build is binary from build-arch,build-indep'); ok(build_is(BUILD_BINARY), 'build is binary from build-arch,build-indep'); -set_build_type_from_targets('binary', '--targets=binary', nocheck => 1); +set_build_type_from_targets('binary', '--targets=binary', no_check => 1); is(get_build_options_from_type(), 'binary', 'build is binary from binary'); ok(build_is(BUILD_BINARY), 'build is binary from binary'); set_build_type_from_targets('clean,binary-indep', - '--targets=clean,binary-indep', nocheck => 1); + '--targets=clean,binary-indep', no_check => 1); ok(build_is(BUILD_SOURCE | BUILD_ARCH_INDEP), 'build source,all is source,all'); ok(!build_is(BUILD_SOURCE | BUILD_ARCH_DEP), 'build source,all is not source,any'); ok(build_has_any(BUILD_SOURCE), 'build source,all has_any source'); @@ -74,13 +74,13 @@ ok(!build_has_all(BUILD_SOURCE | BUILD_ARCH_DEP), 'build source,all not has_all source,any'); ok(!build_has_all(BUILD_FULL), 'build source,all has_all full'); -set_build_type(BUILD_BINARY, '--build=binary', nocheck => 1); +set_build_type(BUILD_BINARY, '--build=binary', no_check => 1); ok(build_is(BUILD_BINARY), 'build binary is binary'); ok(build_has_any(BUILD_ARCH_DEP), 'build binary has_any any'); ok(build_has_any(BUILD_ARCH_INDEP), 'build binary has_any all'); ok(build_has_all(BUILD_BINARY), 'build binary has_all binary'); ok(build_has_none(BUILD_SOURCE), 'build binary has_none source'); -set_build_type(BUILD_FULL, '--build=full', nocheck => 1); +set_build_type(BUILD_FULL, '--build=full', no_check => 1); ok(build_has_any(BUILD_SOURCE), 'build full has_any source'); ok(build_has_all(BUILD_BINARY), 'build full has_all binary'); diff --git a/scripts/t/Dpkg_Version.t b/scripts/t/Dpkg_Version.t index 61897570f..41df1e5d4 100644 --- a/scripts/t/Dpkg_Version.t +++ b/scripts/t/Dpkg_Version.t @@ -43,7 +43,7 @@ sub dpkg_vercmp { my $stderr; spawn(exec => [ 'dpkg', '--compare-versions', '--', $a, $cmp, $b ], - error_to_string => \$stderr, wait_child => 1, nocheck => 1); + 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 4450d95d4..843fae3fe 100644 --- a/scripts/t/dpkg_buildpackage.t +++ b/scripts/t/dpkg_buildpackage.t @@ -183,7 +183,7 @@ sub test_build my ($basename, $type) = @_; my $dirname = $basename =~ tr/_/-/r; - set_build_type($type, 'buildtype', nocheck => 1); + set_build_type($type, 'buildtype', no_check => 1); my $typename = get_build_options_from_type(); my $stderr; @@ -217,7 +217,7 @@ sub test_build @hook_opts, ], error_to_string => \$stderr, - wait_child => 1, nocheck => 1); + wait_child => 1, no_check => 1); chdir '..'; ok($? == 0, "dpkg-buildpackage --build=$typename succeeded"); diff --git a/scripts/t/dpkg_buildtree.t b/scripts/t/dpkg_buildtree.t index 3fbe7ebae..ad9f6c867 100644 --- a/scripts/t/dpkg_buildtree.t +++ b/scripts/t/dpkg_buildtree.t @@ -60,7 +60,7 @@ sub test_is_rootless ], error_to_string => \$stderr, wait_child => 1, - nocheck => 1, + no_check => 1, ); if (POSIX::WIFEXITED($?) && POSIX::WEXITSTATUS($?) == 255) { $res = 255; diff --git a/scripts/t/dpkg_mergechangelogs.t b/scripts/t/dpkg_mergechangelogs.t index 05dbe9bb6..b990a123c 100644 --- a/scripts/t/dpkg_mergechangelogs.t +++ b/scripts/t/dpkg_mergechangelogs.t @@ -31,7 +31,7 @@ sub test_merge { 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, nocheck => 1); + 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 726ddb9ac..5d7db85ff 100644 --- a/scripts/t/dpkg_source.t +++ b/scripts/t/dpkg_source.t @@ -150,7 +150,7 @@ sub test_build_source spawn(exec => [ $ENV{PERL}, "$srcdir/dpkg-source.pl", '--build', $name ], error_to_string => \$stderr, - wait_child => 1, nocheck => 1); + wait_child => 1, no_check => 1); ok($? == 0, 'dpkg-source --build succeeded'); diag($stderr) unless $? == 0; diff --git a/scripts/t/mk.t b/scripts/t/mk.t index cf514f82b..c10973255 100644 --- a/scripts/t/mk.t +++ b/scripts/t/mk.t @@ -50,7 +50,7 @@ sub test_makefile { $desc //= 'default'; spawn(exec => [ $Dpkg::PROGMAKE, '-C', $datadir, '-f', $makefile ], - wait_child => 1, nocheck => 1); + 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 4662c890d..32a626ff4 100644 --- a/utils/t/update_alternatives.t +++ b/utils/t/update_alternatives.t @@ -119,7 +119,7 @@ sub call_ua { @cmd = @ua; } - spawn(exec => [ @cmd, @{$params} ], nocheck => 1, + spawn(exec => [ @cmd, @{$params} ], no_check => 1, wait_child => 1, env => { LC_ALL => 'C', %env }, %opts); my $test_id = ''; $test_id = "$opts{test_id}: " if defined $opts{test_id}; -- Dpkg.Org's dpkg
