Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=23132a0b847984b2a13c673fc1106214db75db51
commit 23132a0b847984b2a13c673fc1106214db75db51 Author: Michel Hermier <[email protected]> Date: Fri May 2 11:23:05 2014 +0200 libpacman: Remove all PM_PKG_FORCE usage outside of package.cpp and pacman.cpp. diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index fa2d617..14d7752 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -169,7 +169,7 @@ int _pacman_localdb_desc_fread(Package *info, FILE *fp) } else if(!strcmp(line, "%FORCE%")) { /* FORCE tag only appears in sync repositories, * not the local one. */ - info->force = 1; + info->m_force = 1; } else if(!strcmp(line, "%STICK%")) { /* STICK tag only appears in sync repositories, * not the local one. */ @@ -208,7 +208,7 @@ int _pacman_localdb_depends_fread(Package *info, FILE *fp) } else if(!strcmp(line, "%FORCE%")) { /* FORCE tag only appears in sync repositories, * not the local one. */ - info->force = 1; + info->m_force = 1; } else if(!strcmp(line, "%STICK%")) { /* STICK tag only appears in sync repositories, * not the local one. */ diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 112fc81..2ac65c7 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -80,7 +80,7 @@ Package::Package(const libpacman::Package &other) STRNCPY(arch, other.arch, PKG_ARCH_LEN); size = other.size; usize = other.usize; - force = other.force; + m_force = other.m_force; stick = other.stick; scriptlet = other.scriptlet; m_reason = other.m_reason; @@ -409,7 +409,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_REASON: data = (void *)(long)m_reason; break; case PM_PKG_LICENSE: data = license; break; case PM_PKG_REPLACES: data = m_replaces; break; - case PM_PKG_FORCE: data = (void *)(long)force; break; + case PM_PKG_FORCE: data = (void *)(long)m_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; diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 0f7b62d..0f9a3eb 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -138,7 +138,7 @@ public: unsigned long size; unsigned long usize; unsigned char scriptlet; - unsigned char force; + unsigned char m_force; unsigned char stick; time_t date; unsigned char m_reason; diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index 96e373f..006b5d0 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -22,6 +22,7 @@ LIBPACMAN_PACKAGE_PROPERTY(FStringList *, conflicts, CONFLICTS ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, depends, DEPENDS ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, files, FILES ) +LIBPACMAN_PACKAGE_PROPERTY(unsigned char, force, FORCE ) LIBPACMAN_PACKAGE_PROPERTY(const char *, name, NAME ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, provides, PROVIDES ) LIBPACMAN_PACKAGE_PROPERTY(unsigned char, reason, REASON ) diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index d3138bc..7669c08 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -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 && !spkg->getinfo(PM_PKG_FORCE) && !(trans->flags & PM_TRANS_FLAG_DOWNGRADE)) { + if(cmp > 0 && !spkg->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()); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
