diff options
| author | Patrick Steinhardt <steinhardt.ptk@gmail.com> | 2013-06-18 17:44:15 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-06-26 15:32:16 +1000 |
| commit | dfcea1456da5df042f2ba2ba23efeb245436718f (patch) | |
| tree | 63dcff337bd1306335a8fd98312399dc3da8464e /lib/libalpm/add.c | |
| parent | ec831e05f58e3db1c06aadb23a87b5b82ab3ebf3 (diff) | |
| download | pacman-dfcea1456da5df042f2ba2ba23efeb245436718f.tar.xz | |
Enable inverted patterns in NoExtract and NoUpgrade.
It is now possible to invert patterns in NoExtract and NoUpgrade.
This feature allows users to whitelist certain files that were
previously blacklisted by another entry.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index cab04a8b..3d0cf55a 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -183,7 +183,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } /* if a file is in NoExtract then we never extract it */ - if(alpm_list_find(handle->noextract, entryname, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(handle->noextract, entryname) == 0) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract," " skipping extraction of %s\n", entryname, filename); @@ -245,7 +245,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } else { /* case 3: */ /* if file is in NoUpgrade, don't touch it */ - if(alpm_list_find(handle->noupgrade, entryname, _alpm_fnmatch)) { + if(_alpm_fnmatch_patterns(handle->noupgrade, entryname) == 0) { notouch = 1; } else { alpm_backup_t *backup; |