From 4cd070f32551eb0dd7a2bd355028c346222107d8 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Thu, 28 May 2009 11:13:25 +0200 Subject: - fix noprovide handling in findupdate - add stringify hack - add missing pool_lookup functions --- src/policy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/policy.c') diff --git a/src/policy.c b/src/policy.c index 64274ec..0782592 100644 --- a/src/policy.c +++ b/src/policy.c @@ -528,6 +528,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) Id p, pp, n, p2, pp2; Id obs, *obsp; Solvable *ps; + int haveprovobs = 0; queue_empty(qs); @@ -576,6 +577,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) /* here we have 'p' with a matching provides/obsoletes combination * thus flagging p as a valid update candidate for s */ + haveprovobs = 1; } else continue; @@ -587,7 +589,7 @@ policy_findupdatepackages(Solver *solv, Solvable *s, Queue *qs, int allow_all) } /* if we have found some valid candidates and noupdateprovide is not set, we're done. otherwise we fallback to all obsoletes */ - if (!solv->noupdateprovide && qs->count) + if (!solv->noupdateprovide && haveprovobs) return; if (solv->obsoletes && solv->obsoletes[n - solv->installed->start]) { -- cgit v1.2.3