Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=bbd165f3bf67d9d44c9d484e1d58d3acf3af0b64
commit bbd165f3bf67d9d44c9d484e1d58d3acf3af0b64
Author: Michel Hermier <herm...@frugalware.org>
Date: Thu May 1 08:55:02 2014 +0200
libpacman: Remove all PM_PKG_PROVIDES usage outside of package.cpp and
pacman.cpp.
diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp
index d6d399d..1caef80 100644
--- a/lib/libpacman/conflict.cpp
+++ b/lib/libpacman/conflict.cpp
@@ -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 = dp->getinfo(PM_PKG_PROVIDES);
m; m = m->next) {
+ for(m = dp->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 = otp->getinfo(PM_PKG_PROVIDES);
m; m = m->next) {
+ for(m = otp->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());
@@ -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 =
tp->getinfo(PM_PKG_PROVIDES); n; n = n->next) {
+ for(n = tp->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/package.cpp b/lib/libpacman/package.cpp
index 303b50b..3c36e04 100644
--- a/lib/libpacman/package.cpp
+++ b/lib/libpacman/package.cpp
@@ -549,6 +549,11 @@ const char *Package::version()
return getinfo(PM_PKG_VERSION);
}
+FStringList *Package::provides()
+{
+ return getinfo(PM_PKG_PROVIDES);
+}
+
FStringList *Package::provides() const
{
return m_provides;
@@ -556,7 +561,7 @@ FStringList *Package::provides() const
bool Package::provides(const char *pkgname)
{
- return _pacman_list_is_strin(pkgname, getinfo(PM_PKG_PROVIDES));
+ return _pacman_list_is_strin(pkgname, provides());
}
typedef struct FPackageStrMatcher FPackageStrMatcher;
diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h
index def45cf..80a179a 100644
--- a/lib/libpacman/package.h
+++ b/lib/libpacman/package.h
@@ -113,6 +113,7 @@ public:
const char *name();
const char *version();
+ FStringList *provides();
FStringList *provides() const;
bool provides(const char *pkgname);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
