moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-03-02 10:21:49 -05:00
Code Issues Releases Wiki Activity

Search for non-prefixed paths in skip_remove list

Browse Source 
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 <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-09-19 13:17:16 -05:00
parent 41d8deff88
commit a94ad29740
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libalpm/remove.c
View File

@ -216,12 +216,12 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file,
{ {
char filepath[PATH_MAX]; char filepath[PATH_MAX];
snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name); if(alpm_list_find_str(skip_remove, file->name)) {
if(alpm_list_find_str(skip_remove, filepath)) {
/* return success because we will never actually remove this file */ /* return success because we will never actually remove this file */
return 1; return 1;
} }
snprintf(filepath, PATH_MAX, "%s%s", handle->root, file->name);
/* If we fail write permissions due to a read-only filesystem, abort. /* If we fail write permissions due to a read-only filesystem, abort.
* Assume all other possible failures are covered somewhere else */ * Assume all other possible failures are covered somewhere else */
if(_alpm_access(handle, NULL, filepath, W_OK) == -1) { if(_alpm_access(handle, NULL, filepath, W_OK) == -1) {