diff options
| author | Dan McGee <dan@archlinux.org> | 2011-02-22 16:48:51 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-02-22 16:48:51 -0600 |
| commit | 6735807c0f5ec5464f2977da96b8981e2321940a (patch) | |
| tree | 331511e9b58340bcaef817e307d6185e9f1b9a33 | |
| parent | cfa760203295e99f65234896036f854b5047c90e (diff) | |
| download | pacman-6735807c0f5ec5464f2977da96b8981e2321940a.tar.xz | |
Remove trans->skip_add
This is old code that has since gone stale; we no longer ever add
anything to this list so no need to keep it around and check the
contents during extraction.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/add.c | 8 | ||||
| -rw-r--r-- | lib/libalpm/trans.c | 1 | ||||
| -rw-r--r-- | lib/libalpm/trans.h | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 2cfa23b4..702b12e9 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -185,14 +185,6 @@ static int extract_single_file(struct archive *archive, return(0); } - /* if a file is in the add skiplist we never extract it */ - if(alpm_list_find_str(trans->skip_add, filename)) { - _alpm_log(PM_LOG_DEBUG, "%s is in trans->skip_add, skipping extraction\n", - entryname); - archive_read_data_skip(archive); - return(0); - } - /* Check for file existence. This is one of the more crucial parts * to get 'right'. Here are the possibilities, with the filesystem * on the left and the package on the top: diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 804ab7a1..9d582df3 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -305,7 +305,6 @@ void _alpm_trans_free(pmtrans_t *trans) alpm_list_free_inner(trans->remove, (alpm_list_fn_free)_alpm_pkg_free); alpm_list_free(trans->remove); - FREELIST(trans->skip_add); FREELIST(trans->skip_remove); FREE(trans); diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h index ce2dc529..6702881b 100644 --- a/lib/libalpm/trans.h +++ b/lib/libalpm/trans.h @@ -41,7 +41,6 @@ struct __pmtrans_t { pmtransstate_t state; alpm_list_t *add; /* list of (pmpkg_t *) */ alpm_list_t *remove; /* list of (pmpkg_t *) */ - alpm_list_t *skip_add; /* list of (char *) */ alpm_list_t *skip_remove; /* list of (char *) */ alpm_trans_cb_event cb_event; alpm_trans_cb_conv cb_conv; |