Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=791d7b5105caee9a19f093ee6a5a13a5fca54eed
commit 791d7b5105caee9a19f093ee6a5a13a5fca54eed Author: Michel Hermier <[email protected]> Date: Tue Apr 29 14:25:21 2014 +0200 libpacman: s/_pacman_pkg_getinfo/Package::getinfo/g diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index f09c19e..66a7cfa 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 = _pacman_pkg_getinfo(tp, PM_PKG_CONFLICTS); j; j = j->next) { + for(j = tp->getinfo(PM_PKG_CONFLICTS); j; j = j->next) { if(!strcmp(tp->name, j->data)) { /* a package cannot conflict with itself -- that's just not nice */ continue; @@ -105,7 +105,7 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) } else { /* see if dp provides something in tp's conflict list */ pmlist_t *m; - for(m = _pacman_pkg_getinfo(dp, PM_PKG_PROVIDES); m; m = m->next) { + for(m = dp->getinfo(PM_PKG_PROVIDES); m; m = m->next) { if(!strcmp(m->data, j->data)) { /* confict */ _pacman_log(PM_LOG_DEBUG, _("targs vs db: found %s as a conflict for %s"), @@ -141,7 +141,7 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) } else { /* see if otp provides something in tp's conflict list */ pmlist_t *m; - for(m = _pacman_pkg_getinfo(otp, PM_PKG_PROVIDES); m; m = m->next) { + for(m = otp->getinfo(PM_PKG_PROVIDES); m; m = m->next) { if(!strcmp(m->data, j->data)) { _pacman_log(PM_LOG_DEBUG, _("targs vs targs: found %s as a conflict for %s"), otp->name, tp->name); @@ -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 = _pacman_pkg_getinfo(pkg, PM_PKG_CONFLICTS); + conflicts = pkg->getinfo(PM_PKG_CONFLICTS); usenewconflicts = 1; } } if(!usenewconflicts) { /* Use the old package's conflicts, it's the only set we have */ - conflicts = _pacman_pkg_getinfo(info, PM_PKG_CONFLICTS); + conflicts = info->getinfo(PM_PKG_CONFLICTS); } for(j = conflicts; j; j = j->next) { if(!strcmp((char *)j->data, tp->name)) { @@ -197,7 +197,7 @@ pmlist_t *_pacman_checkconflicts(pmtrans_t *trans, pmlist_t *packages) pmlist_t *m; for(m = conflicts; m; m = m->next) { pmlist_t *n; - for(n = _pacman_pkg_getinfo(tp, PM_PKG_PROVIDES); n; n = n->next) { + for(n = tp->getinfo(PM_PKG_PROVIDES); n; n = n->next) { if(!strcmp(m->data, n->data)) { _pacman_log(PM_LOG_DEBUG, _("db vs targs: found %s as a conflict for %s"), info->name, tp->name); diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 049acb0..e98a185 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -143,7 +143,7 @@ pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode) pmgraph_t *vertex_j = j->data; Package *p_j = vertex_j->data; int child = 0; - for(k = _pacman_pkg_getinfo(p_i, PM_PKG_DEPENDS); k && !child; k = k->next) { + for(k = p_i->getinfo(PM_PKG_DEPENDS); k && !child; k = k->next) { pmdepend_t depend; _pacman_splitdep(k->data, &depend); child = _pacman_depcmp(p_j, &depend); @@ -235,7 +235,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag if((oldpkg = _pacman_db_get_pkgfromcache(db_local, tp->name)) == NULL) { continue; } - for(j = _pacman_pkg_getinfo(oldpkg, PM_PKG_REQUIREDBY); j; j = j->next) { + for(j = oldpkg->getinfo(PM_PKG_REQUIREDBY); j; j = j->next) { //char *ver; Package *p; found = 0; @@ -247,7 +247,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag /* this package is also in the upgrade list, so don't worry about it */ continue; } - for(k = _pacman_pkg_getinfo(p, PM_PKG_DEPENDS); k; k = k->next) { + for(k = p->getinfo(PM_PKG_DEPENDS); k; k = k->next) { /* don't break any existing dependencies (possible provides) */ _pacman_splitdep(k->data, &depend); if(_pacman_depcmp(oldpkg, &depend) && !_pacman_depcmp(tp, &depend)) { @@ -273,7 +273,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag continue; } - for(j = _pacman_pkg_getinfo(tp, PM_PKG_DEPENDS); j; j = j->next) { + for(j = tp->getinfo(PM_PKG_DEPENDS); j; j = j->next) { /* split into name/version pairs */ _pacman_splitdep((char *)j->data, &depend); found = 0; @@ -358,9 +358,9 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag for(k = packages; k && !found; k = k->next) { Package *p = (Package *)k->data; /* see if the package names match OR if p provides depend.name */ - if(!strcmp(p->name, depend.name) || _pacman_list_is_strin(depend.name, _pacman_pkg_getinfo(p, PM_PKG_PROVIDES))) { + if(!strcmp(p->name, depend.name) || _pacman_list_is_strin(depend.name, p->getinfo(PM_PKG_PROVIDES))) { if(depend.mod == PM_DEP_MOD_ANY || - _pacman_list_is_strin(depend.name, _pacman_pkg_getinfo(p, PM_PKG_PROVIDES))) { + _pacman_list_is_strin(depend.name, p->getinfo(PM_PKG_PROVIDES))) { /* depend accepts any version or p provides depend (provides - by * definition - is for all versions) */ found = 1; @@ -408,13 +408,13 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag } found=0; - for(j = _pacman_pkg_getinfo(tp, PM_PKG_REQUIREDBY); j; j = j->next) { + for(j = tp->getinfo(PM_PKG_REQUIREDBY); j; j = j->next) { if(!_pacman_list_is_strin((char *)j->data, packages)) { /* check if a package in trans->packages provides this package */ for(k=trans->packages; !found && k; k=k->next) { Package *spkg = k->data; - if(spkg && _pacman_list_is_strin(tp->name, _pacman_pkg_getinfo(spkg, PM_PKG_PROVIDES))) { + if(spkg && _pacman_list_is_strin(tp->name, spkg->getinfo(PM_PKG_PROVIDES))) { found=1; } } @@ -422,7 +422,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag pmsyncpkg_t *ps = k->data; Package *spkg = ps->pkg; - if(spkg && _pacman_list_is_strin(tp->name, _pacman_pkg_getinfo(spkg, PM_PKG_PROVIDES))) { + if(spkg && _pacman_list_is_strin(tp->name, spkg->getinfo(PM_PKG_PROVIDES))) { found=1; } } @@ -505,7 +505,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) } for(i = targs; i; i = i->next) { - for(j = (_pacman_pkg_getinfo((Package *)i->data, PM_PKG_DEPENDS)); j; j = j->next) { + for(j = ((Package *)i->data)->getinfo(PM_PKG_DEPENDS); j; j = j->next) { pmdepend_t depend; Package *dep; int needed = 0; @@ -541,7 +541,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) } /* see if other packages need it */ - for(k = _pacman_pkg_getinfo(dep, PM_PKG_REQUIREDBY); k && !needed; k = k->next) { + for(k = dep->getinfo(PM_PKG_REQUIREDBY); k && !needed; k = k->next) { Package *dummy = _pacman_db_get_pkgfromcache(db, k->data); if(!_pacman_pkg_isin(dummy->name, targs)) { needed = 1; @@ -598,7 +598,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, /* check if one of the packages in *list already provides this dependency */ for(j = list; j && !found; j = j->next) { Package *sp = (Package *)j->data; - if(_pacman_list_is_strin(miss->depend.name, _pacman_pkg_getinfo(sp, PM_PKG_PROVIDES))) { + if(_pacman_list_is_strin(miss->depend.name, sp->getinfo(PM_PKG_PROVIDES))) { _pacman_log(PM_LOG_DEBUG, _("%s provides dependency %s -- skipping"), sp->name, miss->depend.name); found = 1; @@ -695,11 +695,11 @@ int _pacman_depcmp(Package *pkg, pmdepend_t *dep) const char *mod = "~="; if(strcmp(pkg->name, dep->name) == 0 - || _pacman_list_is_strin(dep->name, _pacman_pkg_getinfo(pkg, PM_PKG_PROVIDES))) { + || _pacman_list_is_strin(dep->name, pkg->getinfo(PM_PKG_PROVIDES))) { if(dep->mod == PM_DEP_MOD_ANY) { equal = 1; } else { - cmp = _pacman_versioncmp(_pacman_pkg_getinfo(pkg, PM_PKG_VERSION), dep->version); + cmp = _pacman_versioncmp(pkg->getinfo(PM_PKG_VERSION), dep->version); switch(dep->mod) { case PM_DEP_MOD_EQ: equal = (cmp == 0); break; case PM_DEP_MOD_GE: equal = (cmp >= 0); break; @@ -721,12 +721,12 @@ int _pacman_depcmp(Package *pkg, pmdepend_t *dep) if(!_pacman_strempty(dep->version)) { _pacman_log(PM_LOG_DEBUG, _("depcmp: %s-%s %s %s-%s => %s"), - _pacman_pkg_getinfo(pkg, PM_PKG_NAME), _pacman_pkg_getinfo(pkg, PM_PKG_NAME), + pkg->getinfo(PM_PKG_NAME), pkg->getinfo(PM_PKG_VERSION), mod, dep->name, dep->version, (equal ? "match" : "no match")); } else { _pacman_log(PM_LOG_DEBUG, _("depcmp: %s-%s %s %s => %s"), - _pacman_pkg_getinfo(pkg, PM_PKG_NAME), _pacman_pkg_getinfo(pkg, PM_PKG_VERSION), + pkg->getinfo(PM_PKG_NAME), pkg->getinfo(PM_PKG_VERSION), mod, dep->name, (equal ? "match" : "no match")); } @@ -772,7 +772,7 @@ int pacman_output_generate(pmlist_t *targets, pmlist_t *dblist) { targets = _pacman_list_remove(targets, (void*) pname, str_cmp, (void **)&match); if(match) { foundMatch = 1; - for(k = _pacman_pkg_getinfo(pkg, PM_PKG_DEPENDS); k; k = k->next) { + for(k = pkg->getinfo(PM_PKG_DEPENDS); k; k = k->next) { char *fullDep = (char *)k->data; pmdepend_t depend; if(_pacman_splitdep(fullDep, &depend)) { diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 8a178a9..d864656 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -355,14 +355,13 @@ int Package::remove() return database->remove(this); } -static -void *__pacman_pkg_getinfo(Package *pkg, unsigned char parm) +void *Package::getinfo(unsigned char parm) { void *data = NULL; #if 1 /* Update the cache package entry if needed */ - if(pkg->origin == PKG_FROM_CACHE) { + if(origin == PKG_FROM_CACHE) { switch(parm) { /* Desc entry */ case PM_PKG_DESC: @@ -380,9 +379,9 @@ void *__pacman_pkg_getinfo(Package *pkg, unsigned char parm) case PM_PKG_SHA1SUM: case PM_PKG_REPLACES: case PM_PKG_FORCE: - if(!(pkg->infolevel & INFRQ_DESC)) { - _pacman_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); - pkg->database->read(pkg, INFRQ_DESC); + if(!(infolevel & INFRQ_DESC)) { + _pacman_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), name); + database->read(this, INFRQ_DESC); } break; /* Depends entry */ @@ -390,62 +389,62 @@ void *__pacman_pkg_getinfo(Package *pkg, unsigned char parm) case PM_PKG_REQUIREDBY: case PM_PKG_CONFLICTS: case PM_PKG_PROVIDES: - if(!(pkg->infolevel & INFRQ_DEPENDS)) { - _pacman_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", pkg->name); - pkg->database->read(pkg, INFRQ_DEPENDS); + if(!(infolevel & INFRQ_DEPENDS)) { + _pacman_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", name); + database->read(this, INFRQ_DEPENDS); } break; /* Files entry */ case PM_PKG_FILES: case PM_PKG_BACKUP: - if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) { - _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg->name); - pkg->database->read(pkg, INFRQ_FILES); + if(this->data == handle->db_local && !(infolevel & 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(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPLET)) { - _pacman_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), pkg->name); - pkg->database->read(pkg, INFRQ_SCRIPLET); + if(this->data == handle->db_local && !(infolevel & INFRQ_SCRIPLET)) { + _pacman_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), name); + database->read(this, INFRQ_SCRIPLET); } break; } } #else - _pacman_pkg_read(pkg, _pacman_pkg_parm_to_flag(parm)); + read(_pacman_pkg_parm_to_flag(parm)); #endif switch(parm) { - case PM_PKG_NAME: data = pkg->name; break; - case PM_PKG_VERSION: data = pkg->version; break; - case PM_PKG_DESC: data = pkg->desc; break; - case PM_PKG_GROUPS: data = pkg->groups; break; - case PM_PKG_URL: data = pkg->url; break; - case PM_PKG_ARCH: data = pkg->arch; break; - case PM_PKG_BUILDDATE: data = pkg->builddate; break; - case PM_PKG_BUILDTYPE: data = pkg->buildtype; break; - case PM_PKG_INSTALLDATE: data = pkg->installdate; break; - case PM_PKG_PACKAGER: data = pkg->packager; break; - case PM_PKG_SIZE: data = (void *)(long)pkg->size; break; - case PM_PKG_USIZE: data = (void *)(long)pkg->usize; break; - case PM_PKG_REASON: data = (void *)(long)pkg->reason; break; - case PM_PKG_LICENSE: data = pkg->license; break; - case PM_PKG_REPLACES: data = pkg->replaces; break; - case PM_PKG_FORCE: data = (void *)(long)pkg->force; break; - case PM_PKG_STICK: data = (void *)(long)pkg->stick; break; - case PM_PKG_MD5SUM: data = pkg->md5sum; break; - case PM_PKG_SHA1SUM: data = pkg->sha1sum; break; - case PM_PKG_DEPENDS: data = pkg->depends; break; - case PM_PKG_REMOVES: data = pkg->removes; break; - case PM_PKG_REQUIREDBY: data = pkg->requiredby; break; - case PM_PKG_PROVIDES: data = pkg->provides; break; - case PM_PKG_CONFLICTS: data = pkg->conflicts; break; - case PM_PKG_FILES: data = pkg->files; break; - case PM_PKG_BACKUP: data = pkg->backup; break; - case PM_PKG_SCRIPLET: data = (void *)(long)pkg->scriptlet; break; - case PM_PKG_DATA: data = pkg->data; break; - case PM_PKG_TRIGGERS: data = pkg->triggers; break; + case PM_PKG_NAME: data = name; break; + case PM_PKG_VERSION: data = version; break; + case PM_PKG_DESC: data = desc; break; + case PM_PKG_GROUPS: data = groups; break; + case PM_PKG_URL: data = url; break; + case PM_PKG_ARCH: data = arch; break; + case PM_PKG_BUILDDATE: data = builddate; break; + case PM_PKG_BUILDTYPE: data = buildtype; break; + case PM_PKG_INSTALLDATE: data = installdate; break; + case PM_PKG_PACKAGER: data = packager; break; + case PM_PKG_SIZE: data = (void *)(long)size; break; + 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_FORCE: data = (void *)(long)force; break; + case PM_PKG_STICK: data = (void *)(long)stick; break; + case PM_PKG_MD5SUM: data = md5sum; break; + 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_PROVIDES: data = provides; break; + case PM_PKG_CONFLICTS: data = 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; + case PM_PKG_DATA: data = this->data; break; + case PM_PKG_TRIGGERS: data = triggers; break; default: data = NULL; break; @@ -454,15 +453,6 @@ void *__pacman_pkg_getinfo(Package *pkg, unsigned char parm) return(data); } -void *_pacman_pkg_getinfo(Package *pkg, unsigned char parm) -{ -#if 0 - return pkg->operations->getinfo(pkg, parm); -#else - return __pacman_pkg_getinfo(pkg, parm); -#endif -} - pmlist_t *_pacman_pkg_getowners(const char *filename) { struct stat buf; @@ -487,7 +477,7 @@ pmlist_t *_pacman_pkg_getowners(const char *filename) info = lp->data; - for(i = _pacman_pkg_getinfo(info, PM_PKG_FILES); i; i = i->next) { + for(i = info->getinfo(PM_PKG_FILES); i; i = i->next) { char path[PATH_MAX]; snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)i->data); diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 1ede18d..4729e8d 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -98,6 +98,8 @@ public: virtual libpacman::Package *dup() const; + virtual void *getinfo(unsigned char parm); + virtual int read(unsigned int flags); virtual int write(unsigned int flags); /* Optional */ virtual int remove(); /* Optional */ @@ -157,7 +159,6 @@ int _pacman_pkg_cmp(const void *p1, const void *p2); int _pacman_pkg_is_valid(const libpacman::Package *pkg, const pmtrans_t *trans, const char *pkgfile); libpacman::Package *_pacman_pkg_isin(const char *needle, pmlist_t *haystack); -void *_pacman_pkg_getinfo(libpacman::Package *pkg, unsigned char parm); pmlist_t *_pacman_pkg_getowners(const char *filename); int _pacman_packagestrmatcher_init(FMatcher *matcher, const FStrMatcher *strmatcher, int flags); diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index ef90dd7..f9dd47e 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -594,7 +594,7 @@ void *pacman_pkg_getinfo(pmpkg_t *_pkg, unsigned char parm) ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); - return(_pacman_pkg_getinfo(pkg, parm)); + return pkg->getinfo(parm); } /** Get a list of packages that own the specified file diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index e427997..6ac4abb 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -407,7 +407,7 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) /* copy over the install reason */ if(pkg_local) { - pkg_new->reason = (long)_pacman_pkg_getinfo(pkg_local, PM_PKG_REASON); + pkg_new->reason = (long)pkg_local->getinfo(PM_PKG_REASON); } /* check if an older version of said package is already in transaction packages. @@ -1219,7 +1219,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(_pacman_pkg_getinfo(depinfo, PM_PKG_REQUIREDBY), pkg_new->name); + depinfo->requiredby = _pacman_stringlist_append(depinfo->getinfo(PM_PKG_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); @@ -1354,7 +1354,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) } } /* splice out this entry from requiredby */ - depinfo->requiredby = _pacman_list_remove(_pacman_pkg_getinfo(depinfo, PM_PKG_REQUIREDBY), pkg_local->name, str_cmp, (void **)&data); + depinfo->requiredby = _pacman_list_remove(depinfo->getinfo(PM_PKG_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 9a1ac7b..18a5966 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 = _pacman_pkg_getinfo(spkg, PM_PKG_REPLACES); k; k = k->next) { + for(k = spkg->getinfo(PM_PKG_REPLACES); k; k = k->next) { pmlist_t *m; for(m = _pacman_db_get_pkgcache(db_local); m; m = m->next) { Package *lpkg = m->data; @@ -174,7 +174,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) /* compare versions and see if we need to upgrade */ cmp = _pacman_versioncmp(local->version, spkg->version); - if(cmp > 0 && !_pacman_pkg_getinfo(spkg, PM_PKG_FORCE) && !(trans->flags & PM_TRANS_FLAG_DOWNGRADE)) { + if(cmp > 0 && !spkg->getinfo(PM_PKG_FORCE) && !(trans->flags & PM_TRANS_FLAG_DOWNGRADE)) { /* local version is newer */ _pacman_log(PM_LOG_WARNING, _("%s-%s: local version is newer"), local->name, local->version); @@ -188,7 +188,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) /* package too new (UpgradeDelay) */ _pacman_log(PM_LOG_FLOW1, _("%s-%s: delaying upgrade of package (%s)\n"), local->name, local->version, spkg->version); - } else if(_pacman_pkg_getinfo(spkg, PM_PKG_STICK)) { + } else if(spkg->getinfo(PM_PKG_STICK)) { _pacman_log(PM_LOG_WARNING, _("%s-%s: please upgrade manually (%s => %s)"), local->name, local->version, local->version, spkg->version); } else { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
