[dpkg] 177/192: Dpkg::Arch: Do not emit a perl warning if gcc or dpkg is not found

Ximin Luo infinity0 at debian.org
Tue Oct 17 11:04:15 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 4bf65e6ba11fb5097b82073bea48e1ae4a96f5d7
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Apr 9 03:16:40 2017 +0200

    Dpkg::Arch: Do not emit a perl warning if gcc or dpkg is not found
    
    We are emitting options or errors elsewhere.
---
 debian/changelog     | 2 ++
 scripts/Dpkg/Arch.pm | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index db66fbf..a904cf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -111,6 +111,8 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
     - Call source format prerequisites Dpkg::Source::Package method if
       present. Addresses: #877688
     - Unify Dpkg::ErrorHandling subprocess errors with the ones from libdpkg.
+    - Do not emit a perl warning if gcc or dpkg is not found from Dpkg::Arch,
+      the code already handles the commands not being present.
   * Documentation:
     - Document currently accepted syntax for changelogs in deb-changelog(5).
       Closes: #858579
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index 1eeb51a..c3e8915 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -134,6 +134,8 @@ sub get_raw_build_arch()
     # dpkg-architecture itself, by avoiding computing the DEB_BUILD_
     # variables when they are not requested.
 
+    ## no critic (TestingAndDebugging::ProhibitNoWarnings)
+    no warnings qw(exec);
     $build_arch = qx(dpkg --print-architecture);
     syserr('dpkg --print-architecture failed') if $? >> 8;
 
@@ -162,6 +164,8 @@ sub get_build_arch()
 
         return $cc_host_gnu_type{$CC} if defined $cc_host_gnu_type{$CC};
 
+        ## no critic (TestingAndDebugging::ProhibitNoWarnings)
+        no warnings qw(exec);
         $cc_host_gnu_type{$CC} = qx($CC -dumpmachine);
 	if ($? >> 8) {
             $cc_host_gnu_type{$CC} = '';

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git



More information about the Reproducible-commits mailing list