Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=01c1a587c54a3da5fcd9410e3a59acf3ba101567
commit 01c1a587c54a3da5fcd9410e3a59acf3ba101567 Author: Michel Hermier <[email protected]> Date: Thu May 1 13:51:18 2014 +0200 libpacman: Remove all PM_PKG_REQUIREDBY usage outside of package.cpp and pacman.cpp. diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 119d532..0438c39 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -434,7 +434,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) goto cleanup; } _pacman_localdb_write_stringlist("DEPENDS", info->depends, fp); - _pacman_localdb_write_stringlist("REQUIREDBY", info->requiredby, fp); + _pacman_localdb_write_stringlist("REQUIREDBY", info->requiredby(), fp); _pacman_localdb_write_stringlist("CONFLICTS", info->conflicts(), fp); _pacman_localdb_write_stringlist("PROVIDES", info->provides(), fp); fclose(fp); diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index bde56b1..0717af4 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -196,7 +196,7 @@ int _pacman_localdb_depends_fread(Package *info, FILE *fp) if(!strcmp(line, "%DEPENDS%")) { _pacman_db_read_lines(&info->depends, line, sline, fp); } else if(!strcmp(line, "%REQUIREDBY%")) { - _pacman_db_read_lines(&info->requiredby, line, sline, fp); + _pacman_db_read_lines(&info->m_requiredby, line, sline, fp); } else if(!strcmp(line, "%CONFLICTS%")) { _pacman_db_read_lines(&info->m_conflicts, line, sline, fp); } else if(!strcmp(line, "%PROVIDES%")) { diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index e7a835d..48d927a 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -86,7 +86,7 @@ Package::Package(const libpacman::Package &other) reason = other.reason; license = _pacman_list_strdup(other.license); desc_localized = _pacman_list_strdup(other.desc_localized); - requiredby = _pacman_list_strdup(other.requiredby); + m_requiredby = _pacman_list_strdup(other.m_requiredby); m_conflicts = _pacman_list_strdup(other.m_conflicts); files = _pacman_list_strdup(other.files); backup = _pacman_list_strdup(other.backup); @@ -112,7 +112,7 @@ Package::~Package() FREELIST(depends); FREELIST(removes); FREELIST(m_conflicts); - FREELIST(requiredby); + FREELIST(m_requiredby); FREELIST(groups); FREELIST(m_provides); FREELIST(replaces); @@ -415,7 +415,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_SHA1SUM: data = sha1sum; break; case PM_PKG_DEPENDS: data = depends; break; case PM_PKG_REMOVES: data = removes; break; - case PM_PKG_REQUIREDBY: data = requiredby; break; + case PM_PKG_REQUIREDBY: data = m_requiredby; break; case PM_PKG_PROVIDES: data = m_provides; break; case PM_PKG_CONFLICTS: data = m_conflicts; break; case PM_PKG_FILES: data = files; break; @@ -532,6 +532,11 @@ FStringList *Package::conflicts() return getinfo(PM_PKG_CONFLICTS); } +FStringList *Package::requiredby() +{ + return getinfo(PM_PKG_REQUIREDBY); +} + FStringList *Package::provides() { return getinfo(PM_PKG_PROVIDES); @@ -601,7 +606,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { ((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_REQUIREDBY) && f_stringlist_any_match(pkg->requiredby, strmatcher)) || + ((flags & PM_PACKAGE_FLAG_REQUIREDBY) && f_stringlist_any_match(pkg->m_requiredby, 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))) { diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 65aac62..7518f0b 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -119,6 +119,8 @@ public: FStringList *provides() const; bool provides(const char *pkgname); + FStringList *requiredby(); + libpacman::Database *database; unsigned int flags; @@ -148,7 +150,7 @@ public: FStringList *backup; FStringList *depends; FStringList *removes; - FStringList *requiredby; + FStringList *m_requiredby; FStringList *m_conflicts; FStringList *m_provides; FStringList *triggers; diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index 2a8e9b8..0de59a5 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -439,7 +439,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) ret = -1; goto cleanup; } - q->requiredby = _pacman_list_strdup(local->requiredby); + q->m_requiredby = _pacman_list_strdup(local->requiredby()); if(ps->type != PM_SYNC_TYPE_REPLACE) { /* switch this sync type to REPLACE */ ps->type = PM_SYNC_TYPE_REPLACE; @@ -719,8 +719,8 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) pmlist_t *k; Package *old = j->data; /* merge lists */ - for(k = old->requiredby; k; k = k->next) { - if(!_pacman_list_is_strin(k->data, pkg_new->requiredby)) { + for(k = old->requiredby(); k; k = k->next) { + if(!_pacman_list_is_strin(k->data, pkg_new->requiredby())) { /* replace old's name with new's name in the requiredby's dependency list */ pmlist_t *m; Package *depender = _pacman_db_get_pkgfromcache(db_local, k->data); @@ -742,7 +742,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) pkg_new->name(), pkg_new->version()); } /* add the new requiredby */ - pkg_new->requiredby = _pacman_stringlist_append(pkg_new->requiredby, k->data); + pkg_new->m_requiredby = _pacman_stringlist_append(pkg_new->m_requiredby, k->data); } } } diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 562d48e..e8a318d 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1175,7 +1175,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) } if(tmppm->data && (!strcmp(depend.name, pkg_new->name()) || pkg_new->provides(depend.name))) { _pacman_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), tmpp->name(), pkg_new->name()); - pkg_new->requiredby = _pacman_stringlist_append(pkg_new->requiredby, tmpp->name()); + pkg_new->m_requiredby = _pacman_stringlist_append(pkg_new->m_requiredby, tmpp->name()); } } } @@ -1225,7 +1225,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) } } _pacman_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), pkg_new->name(), depinfo->name()); - depinfo->requiredby = _pacman_stringlist_append(depinfo->getinfo(PM_PKG_REQUIREDBY), pkg_new->name()); + depinfo->m_requiredby = _pacman_stringlist_append(depinfo->requiredby(), pkg_new->name()); if(db_local->write(depinfo, INFRQ_DEPENDS)) { _pacman_log(PM_LOG_ERROR, _("could not update 'requiredby' database entry %s-%s"), depinfo->name(), depinfo->version()); @@ -1360,7 +1360,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) } } /* splice out this entry from requiredby */ - depinfo->requiredby = _pacman_list_remove(depinfo->getinfo(PM_PKG_REQUIREDBY), pkg_local->name(), str_cmp, (void **)&data); + depinfo->m_requiredby = _pacman_list_remove(depinfo->requiredby(), pkg_local->name(), str_cmp, (void **)&data); FREE(data); _pacman_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), depinfo->name()); if(db_local->write(depinfo, INFRQ_DEPENDS)) { diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index 47a5760..bb1b96c 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -112,7 +112,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) pm_errno = PM_ERR_MEMORY; goto error; } - dummy->requiredby = _pacman_list_strdup(lpkg->requiredby); + dummy->m_requiredby = _pacman_list_strdup(lpkg->requiredby()); /* check if spkg->name is already in the packages list. */ ps = _pacman_trans_find(trans, spkg->name()); if(ps) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
