summaryrefslogtreecommitdiff
path: root/src/unpack.c
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2014-09-10 12:56:16 +0200
committerGuillem Jover <guillem@debian.org>2014-10-06 00:48:12 +0200
commit5c4fdbe903f5006eee3337a1b2c08c1cfe114191 (patch)
treef8c163f75bcc784b96a6101efcbe300d80bb9225 /src/unpack.c
parenta34bbbbc918c30a1f6bc403c62512d3c4afb3cbc (diff)
downloaddpkg-5c4fdbe903f5006eee3337a1b2c08c1cfe114191.tar.gz
dpkg, dselect: Use subproc_wait_check() instead of ad-hoc code in call sites
Diffstat (limited to 'src/unpack.c')
-rw-r--r--src/unpack.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/unpack.c b/src/unpack.c
index 943287d42..481a89db3 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -103,8 +103,8 @@ deb_reassemble(const char **filename, const char **pfilename)
ohshite(_("unable to execute %s (%s)"),
_("split package reassembly"), SPLITTER);
}
- status = subproc_wait(pid, SPLITTER);
- switch (WIFEXITED(status) ? WEXITSTATUS(status) : -1) {
+ status = subproc_wait_check(pid, SPLITTER, PROCNOERR);
+ switch (status) {
case 0:
/* It was a part - is it complete? */
if (!stat(reasmbuf, &stab)) {
@@ -120,7 +120,7 @@ deb_reassemble(const char **filename, const char **pfilename)
/* No, it wasn't a part. */
break;
default:
- subproc_check(status, SPLITTER, 0);
+ internerr("unexpected exit status %d from %s", status, SPLITTER);
}
return true;