Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=82d8e79305cf4cd0ef1674c192b0bcb195eb4648
commit 82d8e79305cf4cd0ef1674c192b0bcb195eb4648 Author: Michel Hermier <[email protected]> Date: Fri May 2 14:31:44 2014 +0200 libpacman: Deprecate INFRQ_* to promote PM_PACKAGE_FLAG_*. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index f82cf76..dafdb9e 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -33,6 +33,7 @@ /* pacman-g2 */ #include "cache.h" +#include "db/localdb_files.h" #include "util/list.h" #include "util/log.h" #include "util/stringlist.h" diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index 13aaeae..b8e1174 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -28,6 +28,7 @@ /* pacman-g2 */ #include "conflict.h" +#include "db/localdb_files.h" #include "util.h" #include "error.h" #include "cache.h" diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index 79f5f58..7cd1287 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -29,14 +29,6 @@ #include "handle.h" #include "object.h" -/* Database entries */ -#define INFRQ_NONE 0x00 -#define INFRQ_DESC 0x01 -#define INFRQ_DEPENDS 0x02 -#define INFRQ_FILES 0x04 -#define INFRQ_SCRIPLET 0x08 -#define INFRQ_ALL 0xFF - namespace libpacman { class Database; diff --git a/lib/libpacman/db/localdb_files.h b/lib/libpacman/db/localdb_files.h index 3eb4478..185ec86 100644 --- a/lib/libpacman/db/localdb_files.h +++ b/lib/libpacman/db/localdb_files.h @@ -29,53 +29,60 @@ #define PM_LOCALPACKAGE_FLAGS_NONE 0 -#define PM_LOCALPACKAGE_FLAGS_DESC \ - PM_PACKAGE_FLAG_ARCH | \ - PM_PACKAGE_FLAG_BUILDDATE | \ - PM_PACKAGE_FLAG_BUILDTYPE | \ - PM_PACKAGE_FLAG_DESCRIPTION | \ - PM_PACKAGE_FLAG_FORCE | \ - PM_PACKAGE_FLAG_GROUPS | \ - PM_PACKAGE_FLAG_INSTALLDATE | \ - PM_PACKAGE_FLAG_LICENSE | \ - PM_PACKAGE_FLAG_NAME | \ - PM_PACKAGE_FLAG_PACKAGER | \ - PM_PACKAGE_FLAG_REASON | \ - PM_PACKAGE_FLAG_REPLACES | \ - PM_PACKAGE_FLAG_STICKY | \ - PM_PACKAGE_FLAG_URL | \ - PM_PACKAGE_FLAG_TRIGGERS | \ - PM_PACKAGE_FLAG_VERSION | \ - 0 -#if 0 - /* Desc entry */ - PM_PACKAGE_FLAG_HASH | \ - PM_PACKAGE_FLAG_LOCALISED_DESCRIPTION | \ - PM_PACKAGE_FLAG_REMOVES | \ - PM_PKG_SIZE | \ - PM_PKG_USIZE | \ - PM_PKG_MD5SUM | \ - PM_PKG_SHA1SUM | \ +#define PM_LOCALPACKAGE_FLAGS_DESC ( \ + PM_PACKAGE_FLAG_ARCH | \ + PM_PACKAGE_FLAG_BUILDDATE | \ + PM_PACKAGE_FLAG_BUILDTYPE | \ + PM_PACKAGE_FLAG_DESCRIPTION | \ + PM_PACKAGE_FLAG_FORCE | \ + PM_PACKAGE_FLAG_GROUPS | \ + /*PM_PACKAGE_FLAG_HASH |*/ \ + /*PM_PACKAGE_FLAG_HASH_MD5SUM |*/ \ + /*PM_PACKAGE_FLAG_HASH_SHA1SUM |*/ \ + /*PM_PACKAGE_FLAG_LOCALISED_DESCRIPTION |*/ \ + PM_PACKAGE_FLAG_INSTALLDATE | \ + PM_PACKAGE_FLAG_LICENSE | \ + PM_PACKAGE_FLAG_NAME | \ + PM_PACKAGE_FLAG_PACKAGER | \ + PM_PACKAGE_FLAG_REASON | \ + /*PM_PACKAGE_FLAG_REMOVES |*/ \ + PM_PACKAGE_FLAG_REPLACES | \ + /*PM_PACKAGE_FLAG_SIZE |*/ \ + PM_PACKAGE_FLAG_STICKY | \ + PM_PACKAGE_FLAG_URL | \ + PM_PACKAGE_FLAG_TRIGGERS | \ + /*PM_PACKAGE_FLAG_USIZE |*/ \ + PM_PACKAGE_FLAG_VERSION | \ + 0 ) -#endif +#define PM_LOCALPACKAGE_FLAGS_DEPENDS ( \ + PM_PACKAGE_FLAG_CONFLICTS | \ + PM_PACKAGE_FLAG_DEPENDS | \ + PM_PACKAGE_FLAG_PROVIDES | \ + PM_PACKAGE_FLAG_REQUIREDBY | \ + 0 ) -#define PM_LOCALPACKAGE_FLAGS_DEPENDS \ - PM_PACKAGE_FLAG_CONFLITS | \ - PM_PACKAGE_FLAG_DEPENDS | \ - PM_PACKAGE_FLAG_PROVIDES | \ - PM_PACKAGE_FLAG_REQUIREDBY | \ - 0 - -#define PM_LOCALPACKAGE_FLAGS_FILES \ - PM_PACKAGE_FLAG_BACKUP | \ - PM_PACKAGE_FLAG_FILES | \ - 0 +#define PM_LOCALPACKAGE_FLAGS_FILES ( \ + PM_PACKAGE_FLAG_BACKUP | \ + PM_PACKAGE_FLAG_FILES | \ + 0 ) -#define PM_LOCALPACKAGE_FLAGS_SCRIPLET \ - PM_PACKAGE_FLAG_SCRIPTLET | \ - 0 +#define PM_LOCALPACKAGE_FLAGS_SCRIPLET ( \ + PM_PACKAGE_FLAG_SCRIPTLET | \ + 0 ) + +#define PM_LOCALPACKAGE_FLAGS_ALL ( \ + PM_LOCALPACKAGE_FLAGS_DESC | \ + PM_LOCALPACKAGE_FLAGS_DEPENDS | \ + PM_LOCALPACKAGE_FLAGS_FILES | \ + PM_LOCALPACKAGE_FLAGS_SCRIPLET | \ + 0 ) -#define PM_LOCALPACKAGE_FLAGS_ALL ~0 +#define INFRQ_DESC PM_LOCALPACKAGE_FLAGS_DESC +#define INFRQ_DEPENDS PM_LOCALPACKAGE_FLAGS_DEPENDS +#define INFRQ_FILES PM_LOCALPACKAGE_FLAGS_FILES +#define INFRQ_SCRIPLET PM_LOCALPACKAGE_FLAGS_SCRIPLET +#define INFRQ_ALL PM_LOCALPACKAGE_FLAGS_ALL int _pacman_localdb_desc_fread(libpacman::Package *info, FILE *fp); int _pacman_localdb_depends_fread(libpacman::Package *info, FILE *fp); diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index d8480e0..84a14b2 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -30,6 +30,7 @@ /* pacman-g2 */ #include "deps.h" +#include "db/localdb_files.h" #include "util/list.h" #include "util/log.h" #include "util/stringlist.h" diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index bfc2eaf..86c2916 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -27,6 +27,7 @@ /* pacman-g2 */ #include "package.h" +#include "db/localdb_files.h" #include "util.h" #include "error.h" #include "db.h" @@ -592,7 +593,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { ((flags & PM_PACKAGE_FLAG_DEPENDS) && f_stringlist_any_match(pkg->m_depends, strmatcher)) || ((flags & PM_PACKAGE_FLAG_REMOVES) && f_stringlist_any_match(pkg->removes, 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_CONFLICTS) && 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))) { return 1; diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 1b294ba..4e1bb82 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -69,7 +69,7 @@ enum { #define PM_PACKAGE_FLAG_DEPENDS (1<<15) #define PM_PACKAGE_FLAG_REMOVES (1<<16) #define PM_PACKAGE_FLAG_REQUIREDBY (1<<17) -#define PM_PACKAGE_FLAG_CONFLITS (1<<18) +#define PM_PACKAGE_FLAG_CONFLICTS (1<<18) #define PM_PACKAGE_FLAG_PROVIDES (1<<19) #define PM_PACKAGE_FLAG_TRIGGERS (1<<20) #define PM_PACKAGE_FLAG_PACKAGER (1<<21) @@ -157,7 +157,7 @@ public: /* internal */ unsigned char origin; void *data; - unsigned char infolevel; + unsigned int infolevel; }; } diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index e50202d..bfff686 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -27,6 +27,7 @@ /* pacman-g2 */ #include "sync.h" +#include "db/localdb_files.h" #include "error.h" #include "package.h" #include "db.h" diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 20c4107..774c847 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -28,6 +28,7 @@ #include "trans.h" #include "db/fakedb.h" +#include "db/localdb_files.h" #include "package/fpmpackage.h" #include "conflict.h" #include "deps.h" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
