Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-02-16 21:07:34 +0000
committerAurelien Foret <aurelien@archlinux.org>2006-02-16 21:07:34 +0000
commiteefe29d99ae8dfbbbfcc45f2e7282c5645b20ad9 (patch)
treeb5f1b42f6d5069e96d050653d171587d786ed0d9
parent181efcdeaaa5b7e65d8baeaee02451103a1c1224 (diff)
fixed directory roots when running scriplets
-rw-r--r--lib/libalpm/util.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 6a256096..49580c36 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -405,7 +405,9 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha
}
/* just in case our cwd was removed in the upgrade operation */
- chdir("/");
+ if(chdir(root) != 0) {
+ _alpm_log(PM_LOG_ERROR, "could not change directory to %s (%s)", root, strerror(errno));
+ }
_alpm_log(PM_LOG_FLOW2, "executing %s script...", script);
@@ -431,6 +433,10 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha
_alpm_log(PM_LOG_ERROR, "could not change the root directory (%s)", strerror(errno));
return(1);
}
+ if(chdir("/") != 0) {
+ _alpm_log(PM_LOG_ERROR, "could not change directory to / (%s)", strerror(errno));
+ return(1);
+ }
umask(0022);
_alpm_log(PM_LOG_DEBUG, "executing \"%s\"", cmdline);
execl("/bin/sh", "sh", "-c", cmdline, (char *)0);