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

Use ignoregroup rather than ignoregrp in the handle

Browse source 
This matches the naming in pacman.conf.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2011-06-29 15:59:48 +10:00
parent b1894ccf06
commit fed3e09c94
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libalpm/handle.c
View file

@ -84,7 +84,7 @@ void _alpm_handle_free(alpm_handle_t *handle)
FREELIST(handle->noupgrade); FREELIST(handle->noupgrade);
FREELIST(handle->noextract); FREELIST(handle->noextract);
FREELIST(handle->ignorepkg); FREELIST(handle->ignorepkg);
FREELIST(handle->ignoregrp); FREELIST(handle->ignoregroup);
FREE(handle); FREE(handle);
} }
@ -227,7 +227,7 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignorepkgs(alpm_handle_t *handle)
alpm_list_t SYMEXPORT *alpm_option_get_ignoregroups(alpm_handle_t *handle) alpm_list_t SYMEXPORT *alpm_option_get_ignoregroups(alpm_handle_t *handle)
{ {
CHECK_HANDLE(handle, return NULL); CHECK_HANDLE(handle, return NULL);
return handle->ignoregrp; return handle->ignoregroup;
} }
const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle) const char SYMEXPORT *alpm_option_get_arch(alpm_handle_t *handle)
@ -524,15 +524,15 @@ int SYMEXPORT alpm_option_remove_ignorepkg(alpm_handle_t *handle, const char *pk
int SYMEXPORT alpm_option_add_ignoregroup(alpm_handle_t *handle, const char *grp) int SYMEXPORT alpm_option_add_ignoregroup(alpm_handle_t *handle, const char *grp)
{ {
CHECK_HANDLE(handle, return -1); CHECK_HANDLE(handle, return -1);
handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); handle->ignoregroup = alpm_list_add(handle->ignoregroup, strdup(grp));
return 0; return 0;
} }
int SYMEXPORT alpm_option_set_ignoregroups(alpm_handle_t *handle, alpm_list_t *ignoregrps) int SYMEXPORT alpm_option_set_ignoregroups(alpm_handle_t *handle, alpm_list_t *ignoregrps)
{ {
CHECK_HANDLE(handle, return -1); CHECK_HANDLE(handle, return -1);
if(handle->ignoregrp) FREELIST(handle->ignoregrp); if(handle->ignoregroup) FREELIST(handle->ignoregroup);
handle->ignoregrp = alpm_list_strdup(ignoregrps); handle->ignoregroup = alpm_list_strdup(ignoregrps);
return 0; return 0;
} }
@ -540,7 +540,7 @@ int SYMEXPORT alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char *
{ {
char *vdata = NULL; char *vdata = NULL;
CHECK_HANDLE(handle, return -1); CHECK_HANDLE(handle, return -1);
handle->ignoregrp = alpm_list_remove_str(handle->ignoregrp, grp, &vdata); handle->ignoregroup = alpm_list_remove_str(handle->ignoregroup, grp, &vdata);
if(vdata != NULL) { if(vdata != NULL) {
FREE(vdata); FREE(vdata);
return 1; return 1;

2
lib/libalpm/handle.h
View file

@ -62,7 +62,7 @@ struct __alpm_handle_t {
alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */ alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */
alpm_list_t *noextract; /* List of files NOT to extract */ alpm_list_t *noextract; /* List of files NOT to extract */
alpm_list_t *ignorepkg; /* List of packages to ignore */ alpm_list_t *ignorepkg; /* List of packages to ignore */
alpm_list_t *ignoregrp; /* List of groups to ignore */ alpm_list_t *ignoregroup; /* List of groups to ignore */
/* options */ /* options */
int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ int usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */

4
lib/libalpm/package.c
View file

@ -598,7 +598,7 @@ alpm_pkg_t *_alpm_pkg_find(alpm_list_t *haystack, const char *needle)
/** Test if a package should be ignored. /** Test if a package should be ignored.
* *
* Checks if the package is ignored via IgnorePkg, or if the package is * Checks if the package is ignored via IgnorePkg, or if the package is
* in a group ignored via IgnoreGrp. * in a group ignored via IgnoreGroup.
* *
* @param handle the context handle * @param handle the context handle
* @param pkg the package to test * @param pkg the package to test
@ -615,7 +615,7 @@ int _alpm_pkg_should_ignore(alpm_handle_t *handle, alpm_pkg_t *pkg)
} }
/* next see if the package is in a group that is ignored */ /* next see if the package is in a group that is ignored */
for(groups = handle->ignoregrp; groups; groups = alpm_list_next(groups)) { for(groups = handle->ignoregroup; groups; groups = alpm_list_next(groups)) {
char *grp = (char *)alpm_list_getdata(groups); char *grp = (char *)alpm_list_getdata(groups);
if(alpm_list_find_str(alpm_pkg_get_groups(pkg), grp)) { if(alpm_list_find_str(alpm_pkg_get_groups(pkg), grp)) {
return 1; return 1;