From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 26 Mar 2010 07:21:06 +0000 (+0200)
Subject: Use rpmpsMerge() for collecting element problems in rpmtsProblems()
X-Git-Tag: rpm-4.9.0-beta1~781
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=997954f793359d16af2d34ce9ca41d82a7acb0a1;p=platform%2Fupstream%2Frpm.git

Use rpmpsMerge() for collecting element problems in rpmtsProblems()
---

diff --git a/lib/rpmts.c b/lib/rpmts.c
index 970a5d3..d7d7e35 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -469,18 +469,10 @@ rpmps rpmtsProblems(rpmts ts)
     rpmtsi pi = rpmtsiInit(ts);
     rpmte p;
 
-    /* XXX TODO this cries for rpmpsMerge() */
     while ((p = rpmtsiNext(pi, 0)) != NULL) {
 	rpmps teprobs = rpmteProblems(p);
-	if (teprobs) {
-	    rpmpsi psi = rpmpsInitIterator(teprobs);
-	    while (rpmpsNextIterator(psi) >= 0) {
-		rpmProblem prob = rpmpsGetProblem(psi);
-		rpmpsAppendProblem(ps, prob);
-	    }
-	    rpmpsFreeIterator(psi);
-	    rpmpsFree(teprobs);
-	}
+	rpmpsMerge(ps, teprobs);
+	rpmpsFree(teprobs);
     }
     pi = rpmtsiFree(pi);
     return ps;