/* XXX can't use rpmtsiNext() filter or oc will have wrong value. */
for (oc = 0; (p = rpmtsiNext(pi, 0)) != NULL; oc++) {
- rpmds this, obsoletes;
+ rpmds thisds, obsoletes;
/* Only added binary packages need checking */
if (rpmteType(p) == TR_REMOVED || rpmteIsSource(p))
}
/* Replace already added obsoleted packages by obsoleting package */
- this = rpmteDS(p, RPMTAG_NAME);
+ thisds = rpmteDS(p, RPMTAG_NAME);
rpmdsInit(obsChk);
while (rpmdsNext(obsChk) >= 0) {
- if (rpmdsCompare(obsChk, this)) {
+ if (rpmdsCompare(obsChk, thisds)) {
obsolete = 1;
break;
}
* Always skip identical NEVR.
* On upgrade, if newer NEVR was previously added, skip adding older.
*/
- if (rpmdsCompare(sameChk, this) ||
- (upgrade && rpmdsCompare(newChk, this))) {
+ if (rpmdsCompare(sameChk, thisds) ||
+ (upgrade && rpmdsCompare(newChk, thisds))) {
oc = -1;
break;;
}
/* On upgrade, if older NEVR was previously added, replace with new */
- if (upgrade && rpmdsCompare(oldChk, this) != 0) {
+ if (upgrade && rpmdsCompare(oldChk, thisds) != 0) {
break;
}
}
unsigned int db_instance; /*!< Database instance (of removed pkgs) */
tsortInfo tsi; /*!< Dependency ordering chains. */
- rpmds this; /*!< This package's provided NEVR. */
+ rpmds thisds; /*!< This package's provided NEVR. */
rpmds provides; /*!< Provides: dependencies. */
rpmds requires; /*!< Requires: dependencies. */
rpmds conflicts; /*!< Conflicts: dependencies. */
void rpmteCleanDS(rpmte te)
{
- te->this = rpmdsFree(te->this);
+ te->thisds = rpmdsFree(te->thisds);
te->provides = rpmdsFree(te->provides);
te->requires = rpmdsFree(te->requires);
te->conflicts = rpmdsFree(te->conflicts);
p->pkgFileSize = 0;
p->headerSize = headerSizeof(h, HEADER_MAGIC_NO);
- p->this = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL);
+ p->thisds = rpmdsThis(h, RPMTAG_PROVIDENAME, RPMSENSE_EQUAL);
p->provides = rpmdsNew(h, RPMTAG_PROVIDENAME, 0);
p->requires = rpmdsNew(h, RPMTAG_REQUIRENAME, 0);
p->conflicts = rpmdsNew(h, RPMTAG_CONFLICTNAME, 0);
return NULL;
switch (tag) {
- case RPMTAG_NAME: return te->this;
+ case RPMTAG_NAME: return te->thisds;
case RPMTAG_PROVIDENAME: return te->provides;
case RPMTAG_REQUIRENAME: return te->requires;
case RPMTAG_CONFLICTNAME: return te->conflicts;