diff options
| author | Guillem Jover <guillem@debian.org> | 2016-01-25 23:57:32 (GMT) |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2016-01-26 12:34:03 (GMT) |
| commit | 521e84da3a2b9ad62d5dbab0f4e1794aef149996 (patch) | |
| tree | 9868414e3c1ff48065dc330edb201a7bac420504 | |
| parent | b52810ec8cc3415796a687a0bba6a6c70b9d53af (diff) | |
dpkg: Use ohshit() instead of internerr() for unhandled dpkg-split exit codes
If dpkg-split exits with an unhandled exit code we should not abort
dpkg, we should just handle the error in the same way we handle errors
from debsig-verify or dpkg-deb.
Closes: #812679
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/unpack.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 3a399bc..520e9ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ dpkg (1.18.5) UNRELEASED; urgency=medium * Print the archive filename when dpkg cannot access it. * Check that all passed archive filenames to dpkg exist before queueing them. Closes: #809963 + * Use ohshit() instead of internerr() for unhandled dpkg-split exit codes. + (i.e. do not abort). Closes: #812679 * Perl modules: - Add new CTRL_REPO_RELEASE control block type to Dpkg::Control. - Add new CTRL_COPYRIGHT_HEADER, CTRL_COPYRIGHT_FILES and diff --git a/src/unpack.c b/src/unpack.c index 3e94207..27ca15c 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -120,7 +120,7 @@ deb_reassemble(const char **filename, const char **pfilename) /* No, it wasn't a part. */ break; default: - internerr("unexpected exit status %d from %s", status, SPLITTER); + ohshit(_("subprocess %s returned error exit status %d"), SPLITTER, status); } return true; |