moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 13:28:12 -05:00
Code Issues Releases Wiki Activity

libalpm/trans.c : fix a recently introduced breakage in scriptlets handling.

Browse Source 
Commit 4853a4aad9 used the tmpdir variable
for checking the existence of /bin/sh, without resetting it.

This caused /bin/sh to be deleted during the cleanup part, as soon as a scriptlet
other than pre_upgrade or pre_install was executed.
For example, on the first post_upgrade during a -Su.

I introduced two variables : clean_tmpdir and restore_cwd, for deciding what should
be done in the cleanup part.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
This commit is contained in:
Chantry Xavier 2007-10-14 10:17:48 +02:00 committed by Dan McGee
parent 4e6a03c4f6
commit 3d7e06f204
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libalpm/trans.c
View File

@ -537,11 +537,13 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
{ {
char scriptfn[PATH_MAX]; char scriptfn[PATH_MAX];
char cmdline[PATH_MAX]; char cmdline[PATH_MAX];
char tmpdir[PATH_MAX] = ""; char tmpdir[PATH_MAX];
char cwd[PATH_MAX];
char *scriptpath; char *scriptpath;
struct stat buf; struct stat buf;
char cwd[PATH_MAX] = "";
pid_t pid; pid_t pid;
int clean_tmpdir = 0;
int restore_cwd = 0;
int retval = 0; int retval = 0;
ALPM_LOG_FUNC; ALPM_LOG_FUNC;
@ -568,6 +570,8 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
if(mkdtemp(tmpdir) == NULL) { if(mkdtemp(tmpdir) == NULL) {
_alpm_log(PM_LOG_ERROR, _("could not create temp directory\n")); _alpm_log(PM_LOG_ERROR, _("could not create temp directory\n"));
return(1); return(1);
} else {
clean_tmpdir = 1;
} }
/* either extract or copy the scriptlet */ /* either extract or copy the scriptlet */
@ -593,8 +597,8 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
/* save the cwd so we can restore it later */ /* save the cwd so we can restore it later */
if(getcwd(cwd, PATH_MAX) == NULL) { if(getcwd(cwd, PATH_MAX) == NULL) {
_alpm_log(PM_LOG_ERROR, _("could not get current working directory\n")); _alpm_log(PM_LOG_ERROR, _("could not get current working directory\n"));
/* in case of error, cwd content is undefined: so we set it to something */ } else {
cwd[0] = 0; restore_cwd = 1;
} }
/* just in case our cwd was removed in the upgrade operation */ /* just in case our cwd was removed in the upgrade operation */
@ -662,10 +666,10 @@ int _alpm_runscriptlet(const char *root, const char *installfn,
} }
cleanup: cleanup:
if(strlen(tmpdir) && _alpm_rmrf(tmpdir)) { if(clean_tmpdir && _alpm_rmrf(tmpdir)) {
_alpm_log(PM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); _alpm_log(PM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir);
} }
if(strlen(cwd)) { if(restore_cwd) {
chdir(cwd); chdir(cwd);
} }