From 6f870968edd09479410f3a6a52bb0be75e327366 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 9 Mar 2007 05:33:06 +0000 Subject: * Two fixes when running under a new root (-r|--root) - Check EACCES in can_remove_file, to verify - we're only checking for a read-only FS here... if write permissions fail, we can still remove it - Switched the message when creating DB directories from an error to a debug message * Fix the dep tests once and for all (it wasn't working for provides=() packages) --- lib/libalpm/db.c | 2 +- lib/libalpm/remove.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 451f40d6..148c32dc 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -183,7 +183,7 @@ pmdb_t *_alpm_db_register(const char *treename, alpm_cb_db_register callback) /* make sure the database directory exists */ snprintf(path, PATH_MAX, "%s%s/%s", handle->root, handle->dbpath, treename); if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { - _alpm_log(PM_LOG_ERROR, _("database directory '%s' does not exist, try creating it"), path); + _alpm_log(PM_LOG_DEBUG, _("database directory '%s' does not exist, creating it"), path); if(_alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, NULL); } diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index fed86b0c..47e5cfe7 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -169,9 +169,9 @@ static int can_remove_file(pmtrans_t *trans, const char *path) /* If we fail write permissions due to a read-only filesystem, abort. * Assume all other possible failures are covered somewhere else */ if(access(file, W_OK) == -1) { - if(access(file, F_OK) == 0) { - /* only return failure if the file ACTUALLY exists and we don't have - * permissions */ + if(errno != EACCES && access(file, F_OK) == 0) { + /* only return failure if the file ACTUALLY exists and we can't write to + * it - ignore "chmod -w" simple permission failures */ _alpm_log(PM_LOG_ERROR, _("cannot remove file '%s': %s"), file, strerror(errno)); return(0); -- cgit v1.2.3-24-g4f1b