[dpkg] 174/192: libdpkg: Clarify subprocess error message by shuffling it around

[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 db880e67e10a6b1b33102955027c5d79c49df6d2
Author: Guillem Jover <guillem at debian.org>
Date:   Mon Oct 16 21:37:42 2017 +0200

    libdpkg: Clarify subprocess error message by shuffling it around
    
    For command-names the current message was more or less fine. But for
    command descriptions the message made little sense.
---
 debian/changelog   |  1 +
 lib/dpkg/subproc.c | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aad3a4d..1997b38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,7 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
     default from default.mk.
   * Make --uniform-compression the new default dpkg-deb behavior. Add support
     for negating the option via --no-uniform-compression.
+  * Clarify subprocess error message by shuffling words around.
   * Perl modules:
     - Switch from Dpkg::Util to List::Util, now that the module in the
       new required Perl contains the needed functions.
diff --git a/lib/dpkg/subproc.c b/lib/dpkg/subproc.c
index 8eb0185..b2f36ec 100644
--- a/lib/dpkg/subproc.c
+++ b/lib/dpkg/subproc.c
@@ -136,7 +136,7 @@ subproc_check(int status, const char *desc, enum subproc_flags flags)
 		if (flags & SUBPROC_RETERROR)
 			return n;
 
-		out(_("subprocess %s returned error exit status %d"), desc, n);
+		out(_("%s subprocess returned error exit status %d"), desc, n);
 	} else if (WIFSIGNALED(status)) {
 		n = WTERMSIG(status);
 		if (!n)
@@ -147,16 +147,16 @@ subproc_check(int status, const char *desc, enum subproc_flags flags)
 			return n;
 
 		if (n == SIGINT)
-			out(_("subprocess %s was interrupted"), desc);
+			out(_("%s subprocess was interrupted"), desc);
 		else
-			out(_("subprocess %s was killed by signal (%s)%s"),
+			out(_("%s subprocess was killed by signal (%s)%s"),
 			    desc, strsignal(n),
 			    WCOREDUMP(status) ? _(", core dumped") : "");
 	} else {
 		if (flags & SUBPROC_RETERROR)
 			return -1;
 
-		out(_("subprocess %s failed with wait status code %d"), desc,
+		out(_("%s subprocess failed with wait status code %d"), desc,
 		    status);
 	}
 
@@ -173,7 +173,7 @@ subproc_wait(pid_t pid, const char *desc)
 
 	if (dead_pid != pid) {
 		onerr_abort++;
-		ohshite(_("wait for subprocess %s failed"), desc);
+		ohshite(_("wait for %s subprocess failed"), desc);
 	}
 
 	return status;

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