Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=25cd15f34f9869691cd71dfe5f4f7afa5791fc8f
commit 25cd15f34f9869691cd71dfe5f4f7afa5791fc8f Author: Michel Hermier <[email protected]> Date: Thu May 1 09:15:45 2014 +0200 libpacman: Remove all PM_PKG_CONFLICTS usage outside of package.cpp and pacman.cpp. diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index 1caef80..98ac23b 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -79,7 +79,7 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) howmany - remain + 1); } - for(j = tp->getinfo(PM_PKG_CONFLICTS); j; j = j->next) { + for(j = tp->conflicts(); j; j = j->next) { if(!strcmp(tp->name(), j->data)) { /* a package cannot conflict with itself -- that's just not nice */ continue; @@ -174,13 +174,13 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) Package *pkg = j->data; if(!strcmp(pkg->name(), info->name())) { /* Use the new, to-be-installed package's conflicts */ - conflicts = pkg->getinfo(PM_PKG_CONFLICTS); + conflicts = pkg->conflicts(); usenewconflicts = 1; } } if(!usenewconflicts) { /* Use the old package's conflicts, it's the only set we have */ - conflicts = info->getinfo(PM_PKG_CONFLICTS); + conflicts = info->conflicts(); } for(j = conflicts; j; j = j->next) { if(!strcmp((char *)j->data, tp->name())) { diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 35dc068..119d532 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -435,7 +435,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) } _pacman_localdb_write_stringlist("DEPENDS", info->depends, fp); _pacman_localdb_write_stringlist("REQUIREDBY", info->requiredby, fp); - _pacman_localdb_write_stringlist("CONFLICTS", info->conflicts, fp); + _pacman_localdb_write_stringlist("CONFLICTS", info->conflicts(), fp); _pacman_localdb_write_stringlist("PROVIDES", info->provides(), fp); fclose(fp); fp = NULL; diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index e5fcc24..bde56b1 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -198,7 +198,7 @@ int _pacman_localdb_depends_fread(Package *info, FILE *fp) } else if(!strcmp(line, "%REQUIREDBY%")) { _pacman_db_read_lines(&info->requiredby, line, sline, fp); } else if(!strcmp(line, "%CONFLICTS%")) { - _pacman_db_read_lines(&info->conflicts, line, sline, fp); + _pacman_db_read_lines(&info->m_conflicts, line, sline, fp); } else if(!strcmp(line, "%PROVIDES%")) { _pacman_db_read_lines(&info->m_provides, line, sline, fp); } else if(!strcmp(line, "%REPLACES%")) { diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 6822417..e7a835d 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -87,7 +87,7 @@ Package::Package(const libpacman::Package &other) license = _pacman_list_strdup(other.license); desc_localized = _pacman_list_strdup(other.desc_localized); requiredby = _pacman_list_strdup(other.requiredby); - conflicts = _pacman_list_strdup(other.conflicts); + m_conflicts = _pacman_list_strdup(other.m_conflicts); files = _pacman_list_strdup(other.files); backup = _pacman_list_strdup(other.backup); depends = _pacman_list_strdup(other.depends); @@ -111,7 +111,7 @@ Package::~Package() FREELIST(backup); FREELIST(depends); FREELIST(removes); - FREELIST(conflicts); + FREELIST(m_conflicts); FREELIST(requiredby); FREELIST(groups); FREELIST(m_provides); @@ -417,7 +417,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_REMOVES: data = removes; break; case PM_PKG_REQUIREDBY: data = requiredby; break; case PM_PKG_PROVIDES: data = m_provides; break; - case PM_PKG_CONFLICTS: data = conflicts; break; + case PM_PKG_CONFLICTS: data = m_conflicts; break; case PM_PKG_FILES: data = files; break; case PM_PKG_BACKUP: data = backup; break; case PM_PKG_SCRIPLET: data = (void *)(long)scriptlet; break; @@ -527,6 +527,11 @@ const char *Package::version() return getinfo(PM_PKG_VERSION); } +FStringList *Package::conflicts() +{ + return getinfo(PM_PKG_CONFLICTS); +} + FStringList *Package::provides() { return getinfo(PM_PKG_PROVIDES); @@ -597,7 +602,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { ((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_REQUIREDBY) && f_stringlist_any_match(pkg->requiredby, strmatcher)) || - ((flags & PM_PACKAGE_FLAG_CONFLITS) && f_stringlist_any_match(pkg->conflicts, strmatcher)) || + ((flags & PM_PACKAGE_FLAG_CONFLITS) && f_stringlist_any_match(pkg->m_conflicts, strmatcher)) || ((flags & PM_PACKAGE_FLAG_PROVIDES) && f_stringlist_any_match(pkg->m_provides, strmatcher)) || ((flags & PM_PACKAGE_FLAG_TRIGGERS) && f_stringlist_any_match(pkg->triggers, strmatcher))) { return 1; diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 80a179a..65aac62 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -113,6 +113,8 @@ public: const char *name(); const char *version(); + FStringList *conflicts(); + FStringList *provides(); FStringList *provides() const; bool provides(const char *pkgname); @@ -147,7 +149,7 @@ public: FStringList *depends; FStringList *removes; FStringList *requiredby; - FStringList *conflicts; + FStringList *m_conflicts; FStringList *m_provides; FStringList *triggers; /* internal */ diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 99ec011..36015e6 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -116,7 +116,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) } else if(!strcmp(key, "REMOVE")) { info->removes = f_stringlist_append(info->removes, ptr); } else if(!strcmp(key, "CONFLICT")) { - info->conflicts = f_stringlist_append(info->conflicts, ptr); + info->m_conflicts = f_stringlist_append(info->m_conflicts, ptr); } else if(!strcmp(key, "REPLACES")) { info->replaces = f_stringlist_append(info->replaces, ptr); } else if(!strcmp(key, "PROVIDES")) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
