Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=abc236325deeb795d1abd492d8319771273081d1
commit abc236325deeb795d1abd492d8319771273081d1 Author: Michel Hermier <[email protected]> Date: Fri May 2 10:54:18 2014 +0200 libpacman: Remove all PM_PKG_REASON usage outside of package.cpp and pacman.cpp. diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index c360ac3..6872f9d 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -402,9 +402,9 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) fprintf(fp, "%%SIZE%%\n" "%ld\n\n", info->size); } - if(info->reason) { + if(info->reason()) { fprintf(fp, "%%REASON%%\n" - "%d\n\n", info->reason); + "%d\n\n", info->reason()); } _pacman_localdb_write_stringlist("TRIGGERS", info->triggers, fp); fclose(fp); diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index e5b88a1..8b2f435 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -122,7 +122,7 @@ int _pacman_localdb_desc_fread(Package *info, FILE *fp) goto error; } f_strtrim(tmp); - info->reason = atol(tmp); + info->m_reason = atol(tmp); } else if(!strcmp(line, "%TRIGGERS%")) { _pacman_db_read_lines(&info->triggers, line, sline, fp); } else if(!strcmp(line, "%SIZE%") || !strcmp(line, "%CSIZE%")) { diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 1cc0ea9..d8480e0 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -535,7 +535,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) } /* see if it was explicitly installed */ - if(dep->reason == PM_PKG_REASON_EXPLICIT) { + if(dep->reason() == PM_PKG_REASON_EXPLICIT) { _pacman_log(PM_LOG_FLOW2, _("excluding %s -- explicitly installed"), dep->name()); needed = 1; } diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 4490781..204034f 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -49,12 +49,12 @@ using namespace libpacman; Package::Package(Database *_database) - : database(_database), reason(PM_PKG_REASON_EXPLICIT) + : database(_database), m_reason(PM_PKG_REASON_EXPLICIT) { } Package::Package(const char *name, const char *version) - : reason(PM_PKG_REASON_EXPLICIT) + : m_reason(PM_PKG_REASON_EXPLICIT) { if(!_pacman_strempty(name)) { STRNCPY(m_name, name, PKG_NAME_LEN); @@ -83,7 +83,7 @@ Package::Package(const libpacman::Package &other) force = other.force; stick = other.stick; scriptlet = other.scriptlet; - reason = other.reason; + m_reason = other.m_reason; license = _pacman_list_strdup(other.license); desc_localized = _pacman_list_strdup(other.desc_localized); m_requiredby = _pacman_list_strdup(other.m_requiredby); @@ -406,7 +406,7 @@ void *Package::getinfo(unsigned char parm) 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_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; diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index b7c0c63..96122b9 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -141,7 +141,7 @@ public: unsigned char force; unsigned char stick; time_t date; - unsigned char reason; + unsigned char m_reason; FStringList *desc_localized; FStringList *license; FStringList *m_replaces; diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index c4f5bea..81f3dad 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -23,6 +23,7 @@ LIBPACMAN_PACKAGE_PROPERTY(FStringList *, conflicts, CONFLICTS ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, depends, DEPENDS ) LIBPACMAN_PACKAGE_PROPERTY(const char *, name, NAME ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, provides, PROVIDES ) +LIBPACMAN_PACKAGE_PROPERTY(unsigned char, reason, REASON ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, replaces, REPLACES ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, requiredby, REQUIREDBY) LIBPACMAN_PACKAGE_PROPERTY(const char *, version, VERSION ) diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index 20c981b..e50202d 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -692,9 +692,9 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) * end of the tr->packages list */ spkg = _pacman_list_last(tr->packages)->data; if(ps->type == PM_SYNC_TYPE_DEPEND || trans->flags & PM_TRANS_FLAG_ALLDEPS) { - spkg->reason = PM_PKG_REASON_DEPEND; + spkg->m_reason = PM_PKG_REASON_DEPEND; } else if(ps->type == PM_SYNC_TYPE_UPGRADE && !handle->sysupgrade) { - spkg->reason = PM_PKG_REASON_EXPLICIT; + spkg->m_reason = PM_PKG_REASON_EXPLICIT; } } if(_pacman_trans_prepare(tr, data) == -1) { diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 2114f5d..38e3b9a 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -408,12 +408,12 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) } if(trans->flags & PM_TRANS_FLAG_ALLDEPS) { - pkg_new->reason = PM_PKG_REASON_DEPEND; + pkg_new->m_reason = PM_PKG_REASON_DEPEND; } /* copy over the install reason */ if(pkg_local) { - pkg_new->reason = (long)pkg_local->getinfo(PM_PKG_REASON); + pkg_new->m_reason = pkg_local->reason(); } /* check if an older version of said package is already in transaction packages. _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
