Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2007-03-09 05:33:06 +0000
committerAaron Griffin <aaron@archlinux.org>2007-03-09 05:33:06 +0000
commit6f870968edd09479410f3a6a52bb0be75e327366 (patch)
treeda0b2c83dc754b68e3fadb338a8723936b5d381c
parent68876e4eb029386dffee5c5084551bcc8cfe626d (diff)
* 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)
-rw-r--r--lib/libalpm/db.c2
-rw-r--r--lib/libalpm/remove.c6
-rw-r--r--src/pacman/deptest.c31
3 files changed, 19 insertions, 20 deletions
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);
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c
index abc9ae99..dc968f25 100644
--- a/src/pacman/deptest.c
+++ b/src/pacman/deptest.c
@@ -38,17 +38,6 @@
extern config_t *config;
-static int chk_package(const char *pkgname, pmdepend_t *dep)
-{
- pmpkg_t *pkg;
- pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname);
-
- if(!pkg || !alpm_depcmp(pkg, dep)) {
- return(1);
- }
- return(0);
-}
-
int pacman_deptest(alpm_list_t *targets)
{
int retval = 0;
@@ -60,32 +49,42 @@ int pacman_deptest(alpm_list_t *targets)
for(i = targets; i; i = alpm_list_next(i)) {
int found = 0;
+ pmpkg_t *pkg;
pmdepend_t *dep;
const char *target;
alpm_list_t *j, *provides;
target = alpm_list_getdata(i);
+
+ /* splitdep modifies the string... we'll compensate for now */
+ char *saved_target = NULL;
+ saved_target = calloc(strlen(target)+1, sizeof(char));
+ strncpy(saved_target, target, strlen(target));
+
dep = alpm_splitdep(target);
- if(chk_package(target, dep) == 0) {
+ pkg = alpm_db_get_pkg(alpm_option_get_localdb(), target);
+ if(pkg && alpm_depcmp(pkg, dep)) {
found = 1;
} else {
/* not found, can we find anything that provides this in the local DB? */
provides = alpm_db_whatprovides(alpm_option_get_localdb(), target);
for(j = provides; j; j = alpm_list_next(j)) {
- const char *provide;
- provide = alpm_list_getdata(j);
+ pmpkg_t *pkg;
+ pkg = alpm_list_getdata(j);
- if(chk_package(provide, dep) == 0) {
+ if(pkg && alpm_depcmp(pkg, dep)) {
found = 1;
+ break;
}
}
}
if(!found) {
- MSG(NL, _("requires: %s"), target);
+ MSG(NL, _("requires: %s"), saved_target);
retval = 1;
}
+ free(saved_target);
}
return(retval);
}