break;
case RPMPROB_REQUIRES:
rc = rasprintf(&buf, _("%s is needed by %s%s"),
- altNEVR+2,
- (prob->num1 ? "" : _("(installed) ")), pkgNEVR);
+ prob->str1,
+ (prob->num1 ? "" : _("(installed) ")), altNEVR);
break;
case RPMPROB_CONFLICT:
rc = rasprintf(&buf, _("%s conflicts with %s%s"),
- altNEVR+2,
- (prob->num1 ? "" : _("(installed) ")), pkgNEVR);
+ prob->str1,
+ (prob->num1 ? "" : _("(installed) ")), altNEVR);
break;
case RPMPROB_OBSOLETES:
rc = rasprintf(&buf, _("%s is obsoleted by %s%s"),
- altNEVR+2,
- (prob->num1 ? "" : _("(installed) ")), pkgNEVR);
+ prob->str1,
+ (prob->num1 ? "" : _("(installed) ")), altNEVR);
break;
default:
rc = rasprintf(&buf,
}
}
-void rpmteAddDepProblem(rpmte te, const char * pkgNEVR, rpmds ds,
+void rpmteAddDepProblem(rpmte te, const char * altNEVR, rpmds ds,
fnpyKey * suggestedKeys, int adding)
{
if (te != NULL) {
case 'R': type = RPMPROB_REQUIRES; break;
}
- appendProblem(te, type, pkgNEVR, key, DNEVR, NULL, adding);
+ appendProblem(te, type, rpmteNEVRA(te), key, altNEVR, DNEVR+2, adding);
}
}
continue
# strip arch, split to name, version, release
- nevr = p.pkgNEVR.rsplit('.', 1)[0]
+ nevr = p.altNEVR.rsplit('.', 1)[0]
n, v, r = nevr.rsplit('-', 2)
# extract the dependency information
- needs = p.altNEVR.split()[1:]
+ needs = p._str.split()[1:]
needname = needs[0]
needflags = rpm.RPMSENSE_ANY
if len(needs) == 3: