bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

put back 5 _alpm_log() calls

Browse source
This commit is contained in:
Aurelien Foret 2005-03-29 20:54:47 +00:00
parent cca46deb6f
commit 23cd8d87cb
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/libalpm/util.c
View file

@ -369,7 +369,7 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha
} }
snprintf(tmpdir, PATH_MAX, "%stmp/pacman-XXXXXX", root); snprintf(tmpdir, PATH_MAX, "%stmp/pacman-XXXXXX", root);
if(mkdtemp(tmpdir) == NULL) { if(mkdtemp(tmpdir) == NULL) {
perror("error creating temp directory"); _alpm_log(PM_LOG_ERROR, "could not create temp directory");
return(1); return(1);
} }
_alpm_unpack(installfn, tmpdir, ".INSTALL"); _alpm_unpack(installfn, tmpdir, ".INSTALL");
@ -386,14 +386,12 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha
if(!_alpm_grep(scriptfn, script)) { if(!_alpm_grep(scriptfn, script)) {
/* script not found in scriptlet file */ /* script not found in scriptlet file */
if(strlen(tmpdir) && _alpm_rmrf(tmpdir)) { if(strlen(tmpdir) && _alpm_rmrf(tmpdir)) {
/* ORE _alpm_log(PM_LOG_WARNING, "could not remove tmpdir %s", tmpdir);
_alpm_log(PM_LOG_WARNING, "could not remove tmpdir %s", tmpdir);*/
} }
return(0); return(0);
} }
/* ORE _alpm_log(PM_LOG_FLOW2, "executing %s script...", script);
_alpm_log(PM_LOG_FLOW2, "Executing %s script...", script);*/
if(oldver) { if(oldver) {
snprintf(cmdline, PATH_MAX, "echo \"umask 0022; source %s %s %s %s\" | chroot %s /bin/sh", snprintf(cmdline, PATH_MAX, "echo \"umask 0022; source %s %s %s %s\" | chroot %s /bin/sh",
scriptpath, script, ver, oldver, root); scriptpath, script, ver, oldver, root);
@ -401,13 +399,11 @@ int _alpm_runscriptlet(char *root, char *installfn, char *script, char *ver, cha
snprintf(cmdline, PATH_MAX, "echo \"umask 0022; source %s %s %s\" | chroot %s /bin/sh", snprintf(cmdline, PATH_MAX, "echo \"umask 0022; source %s %s %s\" | chroot %s /bin/sh",
scriptpath, script, ver, root); scriptpath, script, ver, root);
} }
/* ORE _alpm_log(PM_LOG_FLOW2, "%s", cmdline);
_alpm_log(PM_LOG_FLOW2, "%s", cmdline);*/
system(cmdline); system(cmdline);
if(strlen(tmpdir) && _alpm_rmrf(tmpdir)) { if(strlen(tmpdir) && _alpm_rmrf(tmpdir)) {
/* ORE _alpm_log(PM_LOG_WARNING, "could not remove tmpdir %s", tmpdir);
_alpm_log(PM_LOG_WARNING, "could not remove tmpdir %s", tmpdir);*/
} }
return(0); return(0);
} }