diff options
| author | Dan McGee <dan@archlinux.org> | 2008-10-28 22:20:09 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-10-28 22:20:09 -0500 |
| commit | cd51abf0c8d04c72cc85b28cd45b33b9020c661e (patch) | |
| tree | 18955197d51d579f319792fe473ef1df13dbf175 /lib/libalpm/trans.c | |
| parent | 2e431e1cc3c9bb445ea886521117f483e78aa84a (diff) | |
| parent | a63aeed562c8bdd6604ec50e6a4b684f6edabda3 (diff) | |
| download | pacman-cd51abf0c8d04c72cc85b28cd45b33b9020c661e.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/trans.c')
| -rw-r--r-- | lib/libalpm/trans.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 73ae822e..96ac1bc8 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -551,8 +551,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, if(!pipe) { _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"), strerror(errno)); - retval = 1; - goto cleanup; + exit(1); } while(!feof(pipe)) { char line[PATH_MAX]; @@ -561,7 +560,8 @@ int _alpm_runscriptlet(const char *root, const char *installfn, alpm_logaction("%s", line); EVENT(trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); } - exit(0); + retval = pclose(pipe); + exit(WEXITSTATUS(retval)); } else { /* this code runs for the parent only (wait on the child) */ pid_t retpid; |