The following commit has been merged in the master branch:
commit ac3a40d18a1f4dfbfa35fc92774a81cdf0aa1991
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Fri Nov 21 16:53:35 2008 +0200
libdpkg: Split unrelated conditionals in checksubprocerr for n and PROCPIPE
diff --git a/ChangeLog b/ChangeLog
index 67918fb..b7414a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-12-05 Guillem Jover <[EMAIL PROTECTED]>
+ * lib/mlib.c (checksubprocerr): Split unrelated conditionals for n
+ and PROCPIPE.
+
+2008-12-05 Guillem Jover <[EMAIL PROTECTED]>
+
* lib/mlib.c (checksubprocerr): Return an explicit 0 instead of n.
2008-12-05 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/lib/mlib.c b/lib/mlib.c
index edf21f4..b315e70 100644
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -131,7 +131,11 @@ int checksubprocerr(int status, const char *description,
int flags) {
else
ohshit(_("subprocess %s returned error exit status %d"), description, n);
} else if (WIFSIGNALED(status)) {
- n= WTERMSIG(status); if (!n || ((flags & PROCPIPE) && n==SIGPIPE)) return
0;
+ n = WTERMSIG(status);
+ if (!n)
+ return 0;
+ if ((flags & PROCPIPE) && n == SIGPIPE)
+ return 0;
if (flags & PROCWARN)
warning(_("%s killed by signal (%s)%s"),
description, strsignal(n), WCOREDUMP(status) ? _(", core
dumped") : "");
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
