diff options
| author | Guillem Jover <guillem@debian.org> | 2014-10-01 19:56:11 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2014-10-06 00:48:13 +0200 |
| commit | b8a6ab4c5c88463bfe8ff1e13cddbf397c950c61 (patch) | |
| tree | 74792e7965175a1cb47927127acb52f5391fe490 /src | |
| parent | cece29526d506b89b54cc80a6c400f9f58f36286 (diff) | |
| download | dpkg-b8a6ab4c5c88463bfe8ff1e13cddbf397c950c61.tar.gz | |
libdpkg: Namespace and reword subproc flags
Diffstat (limited to 'src')
| -rw-r--r-- | src/archives.c | 2 | ||||
| -rw-r--r-- | src/configure.c | 4 | ||||
| -rw-r--r-- | src/script.c | 2 | ||||
| -rw-r--r-- | src/unpack.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/archives.c b/src/archives.c index c4286a551..b8554d1a1 100644 --- a/src/archives.c +++ b/src/archives.c @@ -1616,7 +1616,7 @@ archivefiles(const char *const *argv) } if (ferror(pf)) ohshite(_("error reading find's pipe")); if (fclose(pf)) ohshite(_("error closing find's pipe")); - rc = subproc_reap(pid, "find", PROCNOERR); + rc = subproc_reap(pid, "find", SUBPROC_RETERROR); if (rc != 0) ohshit(_("find for --recursive returned unhandled error %i"), rc); diff --git a/src/configure.c b/src/configure.c index fce3e251d..28094d8a0 100644 --- a/src/configure.c +++ b/src/configure.c @@ -212,7 +212,7 @@ show_diff(const char *old, const char *new) } /* Parent process. */ - subproc_reap(pid, _("conffile difference visualizer"), PROCNOCHECK); + subproc_reap(pid, _("conffile difference visualizer"), SUBPROC_NOCHECK); } /** @@ -242,7 +242,7 @@ spawn_shell(const char *confold, const char *confnew) } /* Parent process. */ - subproc_reap(pid, _("conffile shell"), PROCNOCHECK); + subproc_reap(pid, _("conffile shell"), SUBPROC_NOCHECK); } /** diff --git a/src/script.c b/src/script.c index f678b70d6..2f5ae86f9 100644 --- a/src/script.c +++ b/src/script.c @@ -328,7 +328,7 @@ maintscript_fallback(struct pkginfo *pkg, warning(_("unable to stat %s '%.250s': %s"), cmd.name, oldscriptpath, strerror(errno)); } else { - if (!maintscript_exec(pkg, &pkg->installed, &cmd, &stab, PROCWARN)) { + if (!maintscript_exec(pkg, &pkg->installed, &cmd, &stab, SUBPROC_WARN)) { command_destroy(&cmd); post_script_tasks(); return 1; diff --git a/src/unpack.c b/src/unpack.c index 2f3a6e2b5..b98510a46 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -103,7 +103,7 @@ deb_reassemble(const char **filename, const char **pfilename) ohshite(_("unable to execute %s (%s)"), _("split package reassembly"), SPLITTER); } - status = subproc_reap(pid, SPLITTER, PROCNOERR); + status = subproc_reap(pid, SPLITTER, SUBPROC_RETERROR); switch (status) { case 0: /* It was a part - is it complete? */ @@ -145,7 +145,7 @@ deb_verify(const char *filename) } else { int status; - status = subproc_reap(pid, "debsig-verify", PROCNOCHECK); + status = subproc_reap(pid, "debsig-verify", SUBPROC_NOCHECK); if (!(WIFEXITED(status) && WEXITSTATUS(status) == 0)) { if (!fc_badverify) ohshit(_("verification on package %s failed!"), filename); @@ -978,7 +978,7 @@ void process_archive(const char *filename) { ohshit(_("cannot zap possible trailing zeros from dpkg-deb: %s"), err.str); close(p1[0]); p1[0] = -1; - subproc_reap(pid, BACKEND " --fsys-tarfile", PROCPIPE); + subproc_reap(pid, BACKEND " --fsys-tarfile", SUBPROC_NOPIPE); tar_deferred_extract(newfileslist, pkg); |