diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2005-03-26 13:29:47 +0000 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2005-03-26 13:29:47 +0000 |
| commit | 43f4505b1e2be3745468b74771a08cca49148996 (patch) | |
| tree | 7c90a9dbc2866a7fcb9aa8cabddf63123ae852d2 /lib/libalpm/util.c | |
| parent | 10b0e0d9af0e396d30f6fb1f5d321488897746d3 (diff) | |
| download | pacman-43f4505b1e2be3745468b74771a08cca49148996.tar.xz | |
More backport from pacman 2.9.5 (mainly for resolvedeps)
Diffstat (limited to 'lib/libalpm/util.c')
| -rw-r--r-- | lib/libalpm/util.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 12b81be3..174c3a66 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -387,11 +387,15 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha if(!_alpm_grep(scriptfn, script)) { /* script not found in scriptlet file */ + if(strlen(tmpdir) && _alpm_rmrf(tmpdir)) { + /* ORE + _alpm_log(PM_LOG_WARNING, "could not remove tmpdir %s", tmpdir);*/ + } return(0); } /* ORE - _alpm_log(PM_LOG_FLOW2, "Executing %s script...\n", script);*/ + _alpm_log(PM_LOG_FLOW2, "Executing %s script...", script);*/ if(oldver) { snprintf(cmdline, PATH_MAX, "echo \"umask 0022; source %s %s %s %s\" | chroot %s /bin/sh", scriptpath, script, ver, oldver, root); @@ -400,11 +404,12 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha scriptpath, script, ver, root); } /* ORE - _alpm_log(PM_LOG_FLOW2, "%s\n", cmdline);*/ + _alpm_log(PM_LOG_FLOW2, "%s", cmdline);*/ system(cmdline); if(strlen(tmpdir) && _alpm_rmrf(tmpdir)) { - fprintf(stderr, "warning: could not remove tmpdir %s\n", tmpdir); + /* ORE + _alpm_log(PM_LOG_WARNING, "could not remove tmpdir %s", tmpdir);*/ } return(0); } |