bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consolidate --foreign/--native filtering

Browse source 
Also fix a small bug where pacman won't check if the sync dbs are first
downloaded when invoked with --native (it should).

Signed-off-by: Simon Gomizelj <simongmzlj@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Simon Gomizelj 2012-12-13 10:06:41 -05:00 • committed by Allan McRae
parent 8624eddb31
commit cb43bd8dfb
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/pacman/conf.h
View file

@ -50,8 +50,6 @@ typedef struct __config_t {
unsigned short op_q_isfile; unsigned short op_q_isfile;
unsigned short op_q_info; unsigned short op_q_info;
unsigned short op_q_list; unsigned short op_q_list;
unsigned short op_q_foreign;
unsigned short op_q_native;
unsigned short op_q_unrequired; unsigned short op_q_unrequired;
unsigned short op_q_deps; unsigned short op_q_deps;
unsigned short op_q_explicit; unsigned short op_q_explicit;
@ -60,6 +58,7 @@ typedef struct __config_t {
unsigned short op_q_changelog; unsigned short op_q_changelog;
unsigned short op_q_upgrade; unsigned short op_q_upgrade;
unsigned short op_q_check; unsigned short op_q_check;
unsigned short op_q_locality;
unsigned short op_s_clean; unsigned short op_s_clean;
unsigned short op_s_downloadonly; unsigned short op_s_downloadonly;
@ -137,6 +136,14 @@ enum {
PM_CLEAN_KEEPCUR = (1 << 1) PM_CLEAN_KEEPCUR = (1 << 1)
}; };
/** package locality */
enum {
PKG_LOCALITY_UNSET = 0,
PKG_LOCALITY_LOCAL = (1 << 0),
PKG_LOCALITY_FOREIGN = (1 << 1)
};
/* global config variable */ /* global config variable */
extern config_t *config; extern config_t *config;

4
src/pacman/pacman.c
View file

@ -463,8 +463,8 @@ static int parsearg_query(int opt)
case 'i': (config->op_q_info)++; break; case 'i': (config->op_q_info)++; break;
case 'k': (config->op_q_check)++; break; case 'k': (config->op_q_check)++; break;
case 'l': config->op_q_list = 1; break; case 'l': config->op_q_list = 1; break;
case 'm': config->op_q_foreign = 1; break; case 'm': config->op_q_locality |= PKG_LOCALITY_LOCAL; break;
case 'n': config->op_q_native = 1; break; case 'n': config->op_q_locality |= PKG_LOCALITY_FOREIGN; break;
case 'o': config->op_q_owns = 1; break; case 'o': config->op_q_owns = 1; break;
case 'p': config->op_q_isfile = 1; break; case 'p': config->op_q_isfile = 1; break;
case 'q': config->quiet = 1; break; case 'q': config->quiet = 1; break;

16
src/pacman/query.c
View file

@ -361,7 +361,7 @@ static int query_group(alpm_list_t *targets)
return ret; return ret;
} }
static int is_foreign(alpm_pkg_t *pkg) static unsigned short pkg_get_locality(alpm_pkg_t *pkg)
{ {
const char *pkgname = alpm_pkg_get_name(pkg); const char *pkgname = alpm_pkg_get_name(pkg);
alpm_list_t *j; alpm_list_t *j;
@ -369,10 +369,10 @@ static int is_foreign(alpm_pkg_t *pkg)
for(j = sync_dbs; j; j = alpm_list_next(j)) { for(j = sync_dbs; j; j = alpm_list_next(j)) {
if(alpm_db_get_pkg(j->data, pkgname)) { if(alpm_db_get_pkg(j->data, pkgname)) {
return 0; return PKG_LOCALITY_LOCAL;
} }
} }
return 1; return PKG_LOCALITY_FOREIGN;
} }
static int is_unrequired(alpm_pkg_t *pkg) static int is_unrequired(alpm_pkg_t *pkg)
@ -397,12 +397,8 @@ static int filter(alpm_pkg_t *pkg)
alpm_pkg_get_reason(pkg) != ALPM_PKG_REASON_DEPEND) { alpm_pkg_get_reason(pkg) != ALPM_PKG_REASON_DEPEND) {
return 0; return 0;
} }
/* check if this pkg is in a sync DB */ /* check if this pkg is or isn't in a sync DB */
if(config->op_q_native && is_foreign(pkg)) { if(config->op_q_locality && config->op_q_locality & pkg_get_locality(pkg)) {
return 0;
}
/* check if this pkg isn't in a sync DB */
if(config->op_q_foreign && !is_foreign(pkg)) {
return 0; return 0;
} }
/* check if this pkg is unrequired */ /* check if this pkg is unrequired */
@ -474,7 +470,7 @@ int pacman_query(alpm_list_t *targets)
return ret; return ret;
} }
if(config->op_q_foreign || config->op_q_upgrade) { if(config->op_q_locality || config->op_q_upgrade) {
if(check_syncdbs(1, 1)) { if(check_syncdbs(1, 1)) {
return 1; return 1;
} }