summaryrefslogtreecommitdiff
path: root/lib/rpmte.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-03-26 13:20:17 +0200
committerPanu Matilainen <pmatilai@redhat.com>2010-03-26 13:24:00 +0200
commit39ded460e62b38efa26ec665d48e661f7d425a80 (patch)
treeea47caa9c092c369b9edcc6cfec11bcc1ef44e61 /lib/rpmte.c
parenta6bf388ab32f388147084e0f9936ed6567ada776 (diff)
downloadrpm-39ded460e62b38efa26ec665d48e661f7d425a80.tar.gz
rpm-39ded460e62b38efa26ec665d48e661f7d425a80.tar.bz2
rpm-39ded460e62b38efa26ec665d48e661f7d425a80.zip
Change the problem data arrangement for dependency problems
- pkgNEVR in problems is now always the NEVR of the transaction element triggering the problem, and altNEVR is the other affected package, dependency string is stored in the problem string attribute - no user visible changed, except for somebody crazy enough to try to do something other than print the problem message strings - we wouldn't really need to strdup() the pkgNEVR in problems now, but leaving that alone for the moment...
Diffstat (limited to 'lib/rpmte.c')
-rw-r--r--lib/rpmte.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 10e9bee93..43d42acfb 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -749,7 +749,7 @@ void rpmteAddProblem(rpmte te, rpmProblemType type,
}
}
-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) {
@@ -764,7 +764,7 @@ void rpmteAddDepProblem(rpmte te, const char * pkgNEVR, rpmds ds,
case 'R': type = RPMPROB_REQUIRES; break;
}
- appendProblem(te, type, pkgNEVR, key, DNEVR, NULL, adding);
+ appendProblem(te, type, rpmteNEVRA(te), key, altNEVR, DNEVR+2, adding);
}
}