- merge conflicts into problems, handle as transaction set variable.

CVS patchset: 5402
CVS date: 2002/04/13 18:52:18

1 files changed, 8 insertions, 7 deletions

diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index c1aa04f5e..04052f141 100644
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -209,18 +209,19 @@ restart:
     if (numFailed) goto exit;
 
     if (!noDeps) {
-	rpmProblem conflicts = NULL;
-	int numConflicts = 0;
+	rpmProblemSet ps;
 
-	rc = rpmdepCheck(ts, &conflicts, &numConflicts);
+	rc = rpmdepCheck(ts);
 
-	if (conflicts) {
-	    rpmMessage(RPMMESS_ERROR, _("failed dependencies:\n"));
-	    printDepProblems(stderr, conflicts, numConflicts);
-	    conflicts = rpmdepFreeConflicts(conflicts, numConflicts);
+	ps = rpmtsGetProblems(ts);
+	if (ps) {
+	    rpmMessage(RPMMESS_ERROR, _("Failed dependencies:\n"));
+	    printDepProblems(stderr, ps);
+	    ps = rpmProblemSetFree(ps);
 	    rc = -1;
 	    goto exit;
 	}
+	ps = rpmProblemSetFree(ps);
     }
 
     rc = rpmdepOrder(ts);