The following commit has been merged in the master branch:
commit 9fd4358545c340f3cbdf42246f73305397264a22
Author: Guillem Jover <[email protected]>
Date: Thu Mar 11 07:49:58 2010 +0100
libdpkg: Add “subprocess” to strings to clarify
This makes it more clear what the format argument refers to, and as a
side effect coalesces two almost identical strings together.
diff --git a/lib/dpkg/subproc.c b/lib/dpkg/subproc.c
index 03e9d91..d03aa97 100644
--- a/lib/dpkg/subproc.c
+++ b/lib/dpkg/subproc.c
@@ -116,7 +116,7 @@ subproc_check(int status, const char *desc, int flags)
if (flags & PROCNOERR)
return n;
if (flags & PROCWARN)
- warning(_("%s returned error exit status %d"),
+ warning(_("subprocess %s returned error exit status
%d"),
desc, n);
else
ohshit(_("subprocess %s returned error exit status %d"),
@@ -128,7 +128,7 @@ subproc_check(int status, const char *desc, int flags)
if ((flags & PROCPIPE) && n == SIGPIPE)
return 0;
if (flags & PROCWARN)
- warning(_("%s killed by signal (%s)%s"),
+ warning(_("subprocess %s killed by signal (%s)%s"),
desc, strsignal(n),
WCOREDUMP(status) ? _(", core dumped") : "");
else
@@ -153,7 +153,7 @@ subproc_wait(pid_t pid, const char *desc)
if (r != pid) {
onerr_abort++;
- ohshite(_("wait for %s failed"), desc);
+ ohshite(_("wait for subprocess %s failed"), desc);
}
return status;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
