diff options
| author | Guillem Jover <guillem@debian.org> | 2017-10-16 21:37:42 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2017-10-17 02:28:08 +0200 |
| commit | db880e67e10a6b1b33102955027c5d79c49df6d2 (patch) | |
| tree | 651dfef2737239a502f5e13bd42dcd37f5361545 | |
| parent | 0f5d107191fa58a4092d9ce17d079a50c82c4332 (diff) | |
| download | dpkg-db880e67e10a6b1b33102955027c5d79c49df6d2.tar.gz | |
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.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | lib/dpkg/subproc.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index aad3a4dcf..1997b3846 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 8eb01854d..b2f36ec2e 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; |