| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | lib/libalpm/trans.c | 12 |
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 29a74bf9..d6cc3b55 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -231,7 +231,7 @@ int SYMEXPORT alpm_trans_release(alpm_handle_t *handle) /* unlock db */ if(!nolock_flag) { if(_alpm_handle_unlock(handle)) { - _alpm_log(handle, PM_LOG_WARNING, _("could not remove lock file %s\n"), + _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove lock file %s\n"), alpm_option_get_lockfile(handle)); alpm_logaction(handle, "warning: could not remove lock file %s\n", alpm_option_get_lockfile(handle)); @@ -298,7 +298,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, if(access(installfn, R_OK)) { /* not found */ - _alpm_log(handle, PM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn); + _alpm_log(handle, ALPM_LOG_DEBUG, "scriptlet '%s' not found\n", installfn); return 0; } @@ -309,7 +309,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, } snprintf(tmpdir, PATH_MAX, "%stmp/alpm_XXXXXX", handle->root); if(mkdtemp(tmpdir) == NULL) { - _alpm_log(handle, PM_LOG_ERROR, _("could not create temp directory\n")); + _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); return 1; } else { clean_tmpdir = 1; @@ -323,7 +323,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, } } else { if(_alpm_copyfile(installfn, scriptfn)) { - _alpm_log(handle, PM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), scriptfn, strerror(errno)); + _alpm_log(handle, ALPM_LOG_ERROR, _("could not copy tempfile to %s (%s)\n"), scriptfn, strerror(errno)); retval = 1; } } @@ -347,13 +347,13 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *installfn, scriptpath, script, ver); } - _alpm_log(handle, PM_LOG_DEBUG, "executing \"%s\"\n", cmdline); + _alpm_log(handle, ALPM_LOG_DEBUG, "executing \"%s\"\n", cmdline); retval = _alpm_run_chroot(handle, "/bin/sh", argv); cleanup: if(clean_tmpdir && _alpm_rmrf(tmpdir)) { - _alpm_log(handle, PM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); + _alpm_log(handle, ALPM_LOG_WARNING, _("could not remove tmpdir %s\n"), tmpdir); } return retval; |