[dpkg] 175/192: Dpkg::ErrorHandling: Unify subprocess errors with the ones from libdpkg

[Ximin Luo]

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 f9d1a5cdfcc6d2cd0afc008f4070289533904fd7
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Oct 17 00:46:38 2017 +0200

    Dpkg::ErrorHandling: Unify subprocess errors with the ones from libdpkg
---
 debian/changelog              | 1 +
 scripts/Dpkg/ErrorHandling.pm | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1997b38..4416caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,7 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
       of ad-hoc code.
     - Call source format prerequisites Dpkg::Source::Package method if
       present. Addresses: #877688
+    - Unify Dpkg::ErrorHandling subprocess errors with the ones from libdpkg.
   * Documentation:
     - Document currently accepted syntax for changelogs in deb-changelog(5).
       Closes: #858579
diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm
index e54acae..81bc00d 100644
--- a/scripts/Dpkg/ErrorHandling.pm
+++ b/scripts/Dpkg/ErrorHandling.pm
@@ -238,11 +238,13 @@ sub subprocerr(@)
     require POSIX;
 
     if (POSIX::WIFEXITED($?)) {
-	error(g_('%s gave error exit status %s'), $p, POSIX::WEXITSTATUS($?));
+        my $ret = POSIX::WEXITSTATUS($?);
+        error(g_('%s subprocess returned exit status %d'), $p, $ret);
     } elsif (POSIX::WIFSIGNALED($?)) {
-	error(g_('%s died from signal %s'), $p, POSIX::WTERMSIG($?));
+        my $sig = POSIX::WTERMSIG($?);
+        error(g_('%s subprocess was killed by signal %d'), $p, $sig);
     } else {
-	error(g_('%s failed with unknown exit code %d'), $p, $?);
+        error(g_('%s subprocess failed with unknown status code %d'), $p, $?);
     }
 }
 

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