Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=95d13786a04e754c542841b09b48b8d827528172
commit 95d13786a04e754c542841b09b48b8d827528172 Author: Michel Hermier <[email protected]> Date: Wed May 7 20:02:22 2014 +0200 libpacman: Use Package::read instead of Database::read where possible. diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index ef7fcf8..59d233e 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -322,7 +322,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski } if(dbpkg && !(dbpkg->flags & INFRQ_FILES)) { _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name()); - db_local->read(dbpkg, INFRQ_FILES); + dbpkg->read(INFRQ_FILES); } if(dbpkg && _pacman_list_is_strin(j->data, dbpkg->files())) { ok = 1; @@ -338,7 +338,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski dbpkg2 = _pacman_db_get_pkgfromcache(db_local, p2->name()); if(dbpkg2 && !(dbpkg2->flags & INFRQ_FILES)) { _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg2->name()); - db_local->read(dbpkg2, INFRQ_FILES); + dbpkg2->read(INFRQ_FILES); } /* If it used to exist in there, but doesn't anymore */ if(dbpkg2 && !_pacman_list_is_strin(filestr, p2->files()) && _pacman_list_is_strin(filestr, dbpkg2->files())) { diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 6f3ae05..c75810c 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -141,7 +141,7 @@ LocalPackage *_pacman_localdb_pkg_new(LocalDatabase *db, const struct dirent *di dname = dirent->d_name; if((pkg = new LocalPackage(db)) == NULL || !pkg->set_filename(dname, 0) || - db->read(pkg, inforeq) == -1) { + pkg->read(inforeq) == -1) { _pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname); delete pkg; pkg = NULL; diff --git a/lib/libpacman/db/syncdb.cpp b/lib/libpacman/db/syncdb.cpp index 75fc42f..5b6529d 100644 --- a/lib/libpacman/db/syncdb.cpp +++ b/lib/libpacman/db/syncdb.cpp @@ -141,7 +141,7 @@ SyncPackage *_pacman_syncdb_pkg_new(SyncDatabase *db, const struct archive_entry dname = archive_entry_pathname((struct archive_entry *)entry); if((pkg = new SyncPackage(db)) == NULL || !pkg->set_filename(dname, 0) || - db->read(pkg, inforeq) == -1) { + pkg->read(inforeq) == -1) { _pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname); delete pkg; pkg = NULL; diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 0596f8a..d45fff0 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -555,7 +555,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) } /* add it to the target list */ _pacman_log(PM_LOG_DEBUG, _("loading ALL info for '%s'"), pkg->name()); - db->read(pkg, INFRQ_ALL); + pkg->read(INFRQ_ALL); newtargs = _pacman_list_add(newtargs, pkg); _pacman_log(PM_LOG_FLOW2, _("adding '%s' to the targets"), pkg->name()); newtargs = _pacman_removedeps(db, newtargs); diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index a9c9770..aa92bef 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1067,7 +1067,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) if(oldpkg) { if(!(pkg_local->flags & INFRQ_FILES)) { _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg_local->name()); - db_local->read(pkg_local, INFRQ_FILES); + pkg_local->read(INFRQ_FILES); } oldpkg->m_backup = _pacman_list_strdup(pkg_local->m_backup); strncpy(oldpkg->m_name, pkg_local->name(), PKG_NAME_LEN); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
