Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f902b090945b9478f35ead22c14036f30582b7ac
commit f902b090945b9478f35ead22c14036f30582b7ac Author: Michel Hermier <[email protected]> Date: Fri May 2 08:15:40 2014 +0200 libpacman: Remove all PM_PKG_REPLACES usage outside of package.cpp and pacman.cpp. diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index 8db0578..e5b88a1 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -165,7 +165,7 @@ int _pacman_localdb_desc_fread(Package *info, FILE *fp) } else if(!strcmp(line, "%REPLACES%")) { /* the REPLACES tag is special -- it only appears in sync repositories, * not the local one. */ - _pacman_db_read_lines(&info->replaces, line, sline, fp); + _pacman_db_read_lines(&info->m_replaces, line, sline, fp); } else if(!strcmp(line, "%FORCE%")) { /* FORCE tag only appears in sync repositories, * not the local one. */ @@ -204,7 +204,7 @@ int _pacman_localdb_depends_fread(Package *info, FILE *fp) } else if(!strcmp(line, "%REPLACES%")) { /* the REPLACES tag is special -- it only appears in sync repositories, * not the local one. */ - _pacman_db_read_lines(&info->replaces, line, sline, fp); + _pacman_db_read_lines(&info->m_replaces, line, sline, fp); } else if(!strcmp(line, "%FORCE%")) { /* FORCE tag only appears in sync repositories, * not the local one. */ diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 15a35b3..4490781 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -94,7 +94,7 @@ Package::Package(const libpacman::Package &other) removes = _pacman_list_strdup(other.removes); groups = _pacman_list_strdup(other.groups); m_provides = _pacman_list_strdup(other.m_provides); - replaces = _pacman_list_strdup(other.replaces); + m_replaces = _pacman_list_strdup(other.m_replaces); triggers = _pacman_list_strdup(other.triggers); /* internal */ @@ -115,7 +115,7 @@ Package::~Package() FREELIST(m_requiredby); FREELIST(groups); FREELIST(m_provides); - FREELIST(replaces); + FREELIST(m_replaces); FREELIST(triggers); if(origin == PKG_FROM_FILE) { FREE(data); @@ -408,7 +408,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_USIZE: data = (void *)(long)usize; break; case PM_PKG_REASON: data = (void *)(long)reason; break; case PM_PKG_LICENSE: data = license; break; - case PM_PKG_REPLACES: data = replaces; break; + case PM_PKG_REPLACES: data = m_replaces; break; case PM_PKG_FORCE: data = (void *)(long)force; break; case PM_PKG_STICK: data = (void *)(long)stick; break; case PM_PKG_MD5SUM: data = md5sum; break; @@ -585,7 +585,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { ((flags & PM_PACKAGE_FLAG_ARCH) && f_str_match(pkg->arch, strmatcher)) || ((flags & PM_PACKAGE_FLAG_LOCALISED_DESCRIPTION) && f_stringlist_any_match(pkg->desc_localized, strmatcher)) || ((flags & PM_PACKAGE_FLAG_LICENSE) && f_stringlist_any_match(pkg->license, strmatcher)) || - ((flags & PM_PACKAGE_FLAG_REPLACES) && f_stringlist_any_match(pkg->replaces, strmatcher)) || + ((flags & PM_PACKAGE_FLAG_REPLACES) && f_stringlist_any_match(pkg->m_replaces, strmatcher)) || ((flags & PM_PACKAGE_FLAG_GROUPS) && f_stringlist_any_match(pkg->groups, strmatcher)) || ((flags & PM_PACKAGE_FLAG_FILES) && f_stringlist_any_match(pkg->files, strmatcher)) || ((flags & PM_PACKAGE_FLAG_BACKUP) && f_stringlist_any_match(pkg->backup, strmatcher)) || diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index e34331b..b7c0c63 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -144,7 +144,7 @@ public: unsigned char reason; FStringList *desc_localized; FStringList *license; - FStringList *replaces; + FStringList *m_replaces; FStringList *groups; FStringList *files; FStringList *backup; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index d898f00..9d0b537 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -118,7 +118,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) } else if(!strcmp(key, "CONFLICT")) { info->m_conflicts = f_stringlist_append(info->m_conflicts, ptr); } else if(!strcmp(key, "REPLACES")) { - info->replaces = f_stringlist_append(info->replaces, ptr); + info->m_replaces = f_stringlist_append(info->m_replaces, ptr); } else if(!strcmp(key, "PROVIDES")) { info->m_provides = f_stringlist_append(info->m_provides, ptr); } else if(!strcmp(key, "BACKUP")) { diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index 4b51c0f..c4f5bea 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -23,6 +23,7 @@ LIBPACMAN_PACKAGE_PROPERTY(FStringList *, conflicts, CONFLICTS ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, depends, DEPENDS ) LIBPACMAN_PACKAGE_PROPERTY(const char *, name, NAME ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, provides, PROVIDES ) +LIBPACMAN_PACKAGE_PROPERTY(FStringList *, replaces, REPLACES ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, requiredby, REQUIREDBY) LIBPACMAN_PACKAGE_PROPERTY(const char *, version, VERSION ) diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index bb1b96c..d3138bc 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -88,7 +88,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) for(i = dbs_sync; i; i = i->next) { for(j = _pacman_db_get_pkgcache(i->data); j; j = j->next) { Package *spkg = j->data; - for(k = spkg->getinfo(PM_PKG_REPLACES); k; k = k->next) { + for(k = spkg->replaces(); k; k = k->next) { pmlist_t *m; for(m = _pacman_db_get_pkgcache(db_local); m; m = m->next) { Package *lpkg = m->data; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
