diff options
| author | Dan McGee <dan@archlinux.org> | 2011-09-19 21:28:18 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-09-20 17:23:10 +0200 |
| commit | 70e2c34f0f5db329b8e92fe3fc3043e495272f14 (patch) | |
| tree | a975cd75c3af0cbc17d5c22e2f3e9897813954ad | |
| parent | 37961648486ca44a92eefe454cd6f1f091c4fe6d (diff) | |
| download | pacman-70e2c34f0f5db329b8e92fe3fc3043e495272f14.tar.gz pacman-70e2c34f0f5db329b8e92fe3fc3043e495272f14.tar.xz | |
_alpm_runscriptlet(): remove clean_tmpdir variable
This is always true at the end since we return early if we couldn't
create the tmpdir, so it is totally unnecessary.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/trans.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index a4716b8a..a5fa95b9 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -280,7 +280,6 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, char tmpdir[PATH_MAX]; char *argv[] = { "sh", "-c", cmdline, NULL }; char *scriptpath; - int clean_tmpdir = 0; int retval = 0; if(_alpm_access(handle, NULL, installfn, R_OK) != 0) { @@ -297,8 +296,6 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, if(mkdtemp(tmpdir) == NULL) { _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); return 1; - } else { - clean_tmpdir = 1; } /* either extract or copy the scriptlet */ @@ -317,14 +314,14 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, goto cleanup; } - /* chop off the root so we can find the tmpdir in the chroot */ - scriptpath = scriptfn + strlen(handle->root) - 1; - if(!grep(scriptfn, script)) { /* script not found in scriptlet file */ goto cleanup; } + /* chop off the root so we can find the tmpdir in the chroot */ + scriptpath = scriptfn + strlen(handle->root) - 1; + if(oldver) { snprintf(cmdline, PATH_MAX, ". %s; %s %s %s", scriptpath, script, ver, oldver); @@ -338,7 +335,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, retval = _alpm_run_chroot(handle, "/bin/sh", argv); cleanup: - if(clean_tmpdir && _alpm_rmrf(tmpdir)) { + if(_alpm_rmrf(tmpdir)) { _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); } |