From a94ad2974031138dbb4d42a939dfc0cd15a75ce7 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 19 Sep 2011 13:17:16 -0500 Subject: Search for non-prefixed paths in skip_remove list We add them to this list with the root path not appended; we should be searching for them this way as well. Signed-off-by: Dan McGee --- lib/libalpm/remove.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 8021702e..c6a3efcb 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -216,12 +216,12 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, { char filepath[PATH_MAX]; - snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); - - if(alpm_list_find_str(skip_remove, filepath)) { + if(alpm_list_find_str(skip_remove, file->name)) { /* return success because we will never actually remove this file */ return 1; } + + snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); /* If we fail write permissions due to a read-only filesystem, abort. * Assume all other possible failures are covered somewhere else */ if(_alpm_access(handle, NULL, filepath, W_OK) == -1) { -- cgit v1.2.3-24-g4f1b