Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ad4ac3e48f0b7e8936928873ac66437797c39ccf
commit ad4ac3e48f0b7e8936928873ac66437797c39ccf Author: Michel Hermier <[email protected]> Date: Mon May 5 13:47:21 2014 +0200 libpacman: Make Package::removes a getter. diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index ebb4409..209f308 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -96,7 +96,7 @@ Package::Package(const libpacman::Package &other) m_files = _pacman_list_strdup(other.m_files); backup = _pacman_list_strdup(other.backup); m_depends = _pacman_list_strdup(other.m_depends); - removes = _pacman_list_strdup(other.removes); + m_removes = _pacman_list_strdup(other.m_removes); m_groups = _pacman_list_strdup(other.m_groups); m_provides = _pacman_list_strdup(other.m_provides); m_replaces = _pacman_list_strdup(other.m_replaces); @@ -114,7 +114,7 @@ Package::~Package() FREELIST(m_files); FREELIST(backup); FREELIST(m_depends); - FREELIST(removes); + FREELIST(m_removes); FREELIST(m_conflicts); FREELIST(m_requiredby); FREELIST(m_groups); @@ -481,7 +481,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { ((flags & PM_PACKAGE_FLAG_FILES) && f_stringlist_any_match(pkg->files(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_BACKUP) && f_stringlist_any_match(pkg->backup, strmatcher)) || ((flags & PM_PACKAGE_FLAG_DEPENDS) && f_stringlist_any_match(pkg->depends(), strmatcher)) || - ((flags & PM_PACKAGE_FLAG_REMOVES) && f_stringlist_any_match(pkg->removes, strmatcher)) || + ((flags & PM_PACKAGE_FLAG_REMOVES) && f_stringlist_any_match(pkg->removes(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_REQUIREDBY) && f_stringlist_any_match(pkg->requiredby(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_CONFLICTS) && f_stringlist_any_match(pkg->conflicts(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_PROVIDES) && f_stringlist_any_match(pkg->provides(), strmatcher)) || diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 1746365..716e030 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -147,7 +147,7 @@ public: FStringList *m_files; FStringList *backup; FStringList *m_depends; - FStringList *removes; + FStringList *m_removes; FStringList *m_requiredby; FStringList *m_conflicts; FStringList *m_provides; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 56e5455..c66e91b 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -114,7 +114,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) } else if(!strcmp(key, "DEPEND")) { info->m_depends = f_stringlist_append(info->m_depends, ptr); } else if(!strcmp(key, "REMOVE")) { - info->removes = f_stringlist_append(info->removes, ptr); + info->m_removes = f_stringlist_append(info->m_removes, ptr); } else if(!strcmp(key, "CONFLICT")) { info->m_conflicts = f_stringlist_append(info->m_conflicts, ptr); } else if(!strcmp(key, "REPLACES")) { diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index 521f458..708eea1 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -27,6 +27,7 @@ LIBPACMAN_PACKAGE_PROPERTY(FStringList *, groups, GROUPS ) LIBPACMAN_PACKAGE_PROPERTY(const char *, name, NAME ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, provides, PROVIDES ) LIBPACMAN_PACKAGE_PROPERTY(unsigned char, reason, REASON ) +LIBPACMAN_PACKAGE_PROPERTY(FStringList *, removes, REMOVES ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, replaces, REPLACES ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, requiredby, REQUIREDBY) LIBPACMAN_PACKAGE_PROPERTY(unsigned char, stick, STICKY ) diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index ad3160c..40fa7fc 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -871,7 +871,7 @@ void *pacman_pkg_getinfo(pmpkg_t *_pkg, unsigned char parm) case PM_PKG_MD5SUM: data = pkg->md5sum; break; case PM_PKG_SHA1SUM: data = pkg->sha1sum; break; case PM_PKG_DEPENDS: data = pkg->depends(); break; - case PM_PKG_REMOVES: data = pkg->removes; break; + case PM_PKG_REMOVES: data = pkg->removes(); break; case PM_PKG_REQUIREDBY: data = pkg->requiredby(); break; case PM_PKG_PROVIDES: data = pkg->provides(); break; case PM_PKG_CONFLICTS: data = pkg->conflicts(); break; diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 7cab79d..a3f5245 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -513,7 +513,7 @@ int _pacman_add_prepare(pmtrans_t *trans, pmlist_t **data) Package *pkg_new=(Package *)lp->data; pmlist_t *rmlist; - for (rmlist=pkg_new->removes; rmlist!=NULL; rmlist=rmlist->next) { + for (rmlist=pkg_new->removes(); rmlist!=NULL; rmlist=rmlist->next) { char rm_fname[PATH_MAX]; snprintf(rm_fname, PATH_MAX, "%s%s", handle->root, (char *)rmlist->data); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
