diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2014-11-30 00:02:56 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-12-18 13:22:35 +0100 |
| commit | 3af0268fdbafbeb0a2e45d3555ef9d224d89c29d (patch) | |
| tree | d96b4434c9cd7b838d5302ff487677582383201c /lib/libalpm | |
| parent | df36fe2e79d5a5490b89c259bef7a1f150cff575 (diff) | |
| download | pacman-3af0268fdbafbeb0a2e45d3555ef9d224d89c29d.tar.gz pacman-3af0268fdbafbeb0a2e45d3555ef9d224d89c29d.tar.xz | |
remove.c: honor inverted patterns in noupgrade
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/remove.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index dd061e5e..f9b24ef1 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -326,7 +326,7 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file, { char filepath[PATH_MAX]; - if(alpm_list_find(skip_remove, file->name, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(skip_remove, file->name) == 0) { /* return success because we will never actually remove this file */ return 1; } @@ -451,7 +451,7 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, /* check the remove skip list before removing the file. * see the big comment block in db_find_fileconflicts() for an * explanation. */ - if(alpm_list_find(skip_remove, fileobj->name, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(skip_remove, fileobj->name) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in skip_remove, skipping removal\n", file); return 1; |