diff options
| author | Dan McGee <dan@archlinux.org> | 2007-06-28 04:12:59 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-06-28 04:12:59 +0200 |
| commit | ad691001e20272b794d2ed574b556f520e3555c0 (patch) | |
| tree | 03936c85dc0ce627bad177a5b250d661d9d95978 /lib/libalpm/trans.c | |
| parent | 1e56e41d638fcdddc291d9a8ea183b40f4802aae (diff) | |
| download | pacman-ad691001e20272b794d2ed574b556f520e3555c0.tar.gz pacman-ad691001e20272b794d2ed574b556f520e3555c0.tar.xz | |
Remove scriptlet START and DONE commands that we don't use
The scriptlet calling had some unneeded complexity for the time being
which we aren't using here. Let's get rid of it until we find a good way
to implement it correctly.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/trans.c')
| -rw-r--r-- | lib/libalpm/trans.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 403872e0..cde8bf0f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -642,7 +642,6 @@ int _alpm_runscriptlet(const char *root, const char *installfn, } if(pid == 0) { - FILE *pp; _alpm_log(PM_LOG_DEBUG, _("chrooting in %s"), root); if(chroot(root) != 0) { _alpm_log(PM_LOG_ERROR, _("could not change the root directory (%s)"), strerror(errno)); @@ -654,37 +653,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, } umask(0022); _alpm_log(PM_LOG_DEBUG, _("executing \"%s\""), cmdline); - pp = popen(cmdline, "r"); - if(!pp) { - _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"), strerror(errno)); - retval = 1; - goto cleanup; - } - while(!feof(pp)) { - char line[1024]; - if(fgets(line, 1024, pp) == NULL) - break; - /*TODO clean this code up, remove weird SCRIPTLET_START/DONE, - * (void*)atol call, etc. */ - /* "START <event desc>" */ - if((strlen(line) > strlen(SCRIPTLET_START)) - && !strncmp(line, SCRIPTLET_START, strlen(SCRIPTLET_START))) { - EVENT(trans, PM_TRANS_EVT_SCRIPTLET_START, - _alpm_strtrim(line + strlen(SCRIPTLET_START)), NULL); - /* "DONE <ret code>" */ - } else if((strlen(line) > strlen(SCRIPTLET_DONE)) - && !strncmp(line, SCRIPTLET_DONE, strlen(SCRIPTLET_DONE))) { - EVENT(trans, PM_TRANS_EVT_SCRIPTLET_DONE, - (void*)atol(_alpm_strtrim(line + strlen(SCRIPTLET_DONE))), - NULL); - } else { - _alpm_strtrim(line); - /* log our script output */ - alpm_logaction(line); - EVENT(trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); - } - } - pclose(pp); + execl("/bin/sh", "sh", "-c", cmdline, (char *)NULL); exit(0); } else { if(waitpid(pid, 0, 0) == -1) { |