diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2011-10-30 18:33:14 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2011-11-13 20:19:00 +0100 |
| commit | 902305f1633298ff0ef7cd2bfbed0e91aae91646 (patch) | |
| tree | 84b45ee05d773a42b301a98f06153a00de2b9835 /lib/libalpm/add.c | |
| parent | 64d54f674150fdcf4b925f7f27067c7ec0446863 (diff) | |
| download | pacman-902305f1633298ff0ef7cd2bfbed0e91aae91646.tar.gz pacman-902305f1633298ff0ef7cd2bfbed0e91aae91646.tar.xz | |
add support for back end fnmatch'd options
This is work originally provided by Sascha Kruse on FS#20360 with only
minor adjustments to the implementation. It's been expanded to cover:
NoUpgrade, NoExtract, IgnorePkg, IgnoreGroup.
Adds tests ignore008, sync139, sync502, and sync503.
Also satisfies FS#18988.
Original-work-by: Sascha Kruse <knopwob@googlemail.com>
Signed-off-by: Dave Reisner <dreisner@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 d66ab934..44b852f2 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -179,7 +179,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_str(handle->noextract, entryname)) { + if(alpm_list_find(handle->noextract, entryname, _alpm_fnmatch)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction\n", entryname); alpm_logaction(handle, "note: %s is in NoExtract, skipping extraction\n", @@ -259,7 +259,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } else if(S_ISREG(entrymode)) { /* case 4,7: */ /* if file is in NoUpgrade, don't touch it */ - if(alpm_list_find_str(handle->noupgrade, entryname)) { + if(alpm_list_find(handle->noupgrade, entryname, _alpm_fnmatch)) { notouch = 1; } else { alpm_backup_t *backup; |