Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=c4add8356063adf1b9e965443bf6807a65f5e9a7
commit c4add8356063adf1b9e965443bf6807a65f5e9a7 Author: Michel Hermier <[email protected]> Date: Fri May 2 14:48:06 2014 +0200 libpacman: Drop Package::infolevel for Package::flags. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index dafdb9e..48c9fc8 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -197,7 +197,7 @@ int _pacman_db_load_grpcache(Database *db) pmlist_t *i; Package *pkg = lp->data; - if(!(pkg->infolevel & INFRQ_DESC)) { + if(!(pkg->flags & INFRQ_DESC)) { pkg->database->read(pkg, INFRQ_DESC); } diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index b8e1174..ef7fcf8 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -320,7 +320,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski if(dbpkg == NULL) { dbpkg = _pacman_db_get_pkgfromcache(db_local, p->name()); } - if(dbpkg && !(dbpkg->infolevel & INFRQ_FILES)) { + if(dbpkg && !(dbpkg->flags & INFRQ_FILES)) { _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name()); db_local->read(dbpkg, INFRQ_FILES); } @@ -336,7 +336,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski if(strcmp(p2->name(), p->name())) { Package *dbpkg2 = NULL; dbpkg2 = _pacman_db_get_pkgfromcache(db_local, p2->name()); - if(dbpkg2 && !(dbpkg2->infolevel & INFRQ_FILES)) { + if(dbpkg2 && !(dbpkg2->flags & INFRQ_FILES)) { _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg2->name()); db_local->read(dbpkg2, INFRQ_FILES); } diff --git a/lib/libpacman/db.cpp b/lib/libpacman/db.cpp index a420369..eb3923d 100644 --- a/lib/libpacman/db.cpp +++ b/lib/libpacman/db.cpp @@ -156,7 +156,7 @@ int Database::settimestamp(const time_t *timestamp) return _pacman_db_setlastupdate(this, buffer); } -int Database::read(Package *info, unsigned int inforeq) +int Database::read(Package *info, unsigned int flags) { int ret; @@ -166,8 +166,8 @@ int Database::read(Package *info, unsigned int inforeq) return(-1); } - if((ret = ops->read(this, info, inforeq)) == 0) { - info->infolevel |= inforeq; + if((ret = ops->read(this, info, flags)) == 0) { + info->flags |= flags; } return ret; } diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index 7cd1287..571277c 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -65,7 +65,7 @@ public: virtual libpacman::Package *readpkg(unsigned int inforeq) = 0; virtual libpacman::Package *scan(const char *target, unsigned int inforeq) = 0; - virtual int read(libpacman::Package *info, unsigned int inforeq); + virtual int read(libpacman::Package *info, unsigned int flags); virtual int write(libpacman::Package *info, unsigned int inforeq); virtual int remove(libpacman::Package *info); diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 86c2916..99d9e57 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -68,6 +68,8 @@ Package::Package(const char *name, const char *version) Package::Package(const libpacman::Package &other) { database = other.database; + + flags = other.flags; STRNCPY(m_name, other.m_name, PKG_NAME_LEN); STRNCPY(m_version, other.m_version, PKG_VERSION_LEN); STRNCPY(desc, other.desc, PKG_DESC_LEN); @@ -101,7 +103,6 @@ Package::Package(const libpacman::Package &other) /* internal */ origin = other.origin; data = (origin == PKG_FROM_FILE) ? strdup(other.data) : other.data; - infolevel = other.infolevel; } Package::~Package() @@ -358,7 +359,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_SHA1SUM: case PM_PKG_REPLACES: case PM_PKG_FORCE: - if(!(infolevel & INFRQ_DESC)) { + if(!(flags & INFRQ_DESC)) { _pacman_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), name()); database->read(this, INFRQ_DESC); } @@ -368,7 +369,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_REQUIREDBY: case PM_PKG_CONFLICTS: case PM_PKG_PROVIDES: - if(!(infolevel & INFRQ_DEPENDS)) { + if(!(flags & INFRQ_DEPENDS)) { _pacman_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", name()); database->read(this, INFRQ_DEPENDS); } @@ -376,14 +377,14 @@ void *Package::getinfo(unsigned char parm) /* Files entry */ case PM_PKG_FILES: case PM_PKG_BACKUP: - if(this->data == handle->db_local && !(infolevel & INFRQ_FILES)) { + if(this->data == handle->db_local && !(flags & INFRQ_FILES)) { _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), name()); database->read(this, INFRQ_FILES); } break; /* Scriptlet */ case PM_PKG_SCRIPLET: - if(this->data == handle->db_local && !(infolevel & INFRQ_SCRIPLET)) { + if(this->data == handle->db_local && !(flags & INFRQ_SCRIPLET)) { _pacman_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), name()); database->read(this, INFRQ_SCRIPLET); } diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 4e1bb82..c2d3e9b 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -157,7 +157,6 @@ public: /* internal */ unsigned char origin; void *data; - unsigned int infolevel; }; } diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 856d453..b935592 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -242,7 +242,6 @@ Package *_pacman_fpmpackage_load(const char *pkgfile) /* internal */ info->origin = PKG_FROM_FILE; info->data = strdup(pkgfile); - info->infolevel = 0xFF; return(info); diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 774c847..7cab79d 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1095,7 +1095,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) /* we'll need to save some record for backup checks later */ oldpkg = new Package(pkg_local->name(), pkg_local->version()); if(oldpkg) { - if(!(pkg_local->infolevel & INFRQ_FILES)) { + 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); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
