From 2b23209fceb4377bd4c4b5230c580122ffa81b41 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Fri, 31 Aug 2001 14:02:13 +0000
Subject: [PATCH] - fix: Provides: /path did not work with added packages
 (#52183). - fix: progress bar scaling did not include source rpm count.

CVS patchset: 5038
CVS date: 2001/08/31 14:02:13
---
 CHANGES          | 2 ++
 lib/depends.c    | 5 +----
 lib/rpminstall.c | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4be3e25..65cc7e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -227,6 +227,8 @@
 	- python: retrofit sha1 digest using RPMTAG_SHA1RHN.
 	- python: change rhnUnload bindings.
 	- python: teach rhnLoad about RPMTAG_SHA1RHN as well.
+	- fix: Provides: /path did not work with added packages (#52183).
+	- fix: progress bar scaling did not include source rpm count.
 
 4.0 -> 4.0.[12]
 	- add doxygen and lclint annotations most everywhere.
diff --git a/lib/depends.c b/lib/depends.c
index 92520e3..c8e09c7 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -1061,7 +1061,6 @@ alFileSatisfiesDepend(const availableList al,
 
 /**
  * Check added package file lists for package(s) that have a provide.
- * @todo Provides: /path is broken with added packages.
  * @param al		available list
  * @param keyType	type of dependency
  * @param keyDepend	dependency string representation
@@ -1082,11 +1081,9 @@ alAllSatisfiesDepend(const availableList al,
 
     if (*keyName == '/') {
 	ret = alAllFileSatisfiesDepend(al, keyType, keyName);
-#ifdef	BUGZILLA_52183	/* XXX Provides: /path is broken with added packages. */
+	/* XXX Provides: /path was broken with added packages (#52183). */
 	if (ret != NULL && *ret != NULL)
-#endif
 	    return ret;
-
     }
 
     if (!al->index.size || al->index.index == NULL) return NULL;
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 75d86e5..0f365fc 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -511,7 +511,7 @@ restart:
 	rpmProblemSet probs = NULL;
 
 #ifdef FANCY_HASH
-	packagesTotal = numRPMS;
+	packagesTotal = numRPMS + numSRPMS;
 #endif
 	rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n"));
 	rc = rpmRunTransactions(ts, rpmShowProgress,
-- 
2.7.4