diff options
| author | jbj <devnull@localhost> | 2001-08-31 14:02:13 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-08-31 14:02:13 +0000 |
| commit | 2b23209fceb4377bd4c4b5230c580122ffa81b41 (patch) | |
| tree | e963841085de9c727768254589550f3b2d62b747 | |
| parent | 46713343fb02fe669de4ff879e1e3477746c05d1 (diff) | |
| download | rpm-2b23209fceb4377bd4c4b5230c580122ffa81b41.tar.gz rpm-2b23209fceb4377bd4c4b5230c580122ffa81b41.tar.bz2 rpm-2b23209fceb4377bd4c4b5230c580122ffa81b41.zip | |
- 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
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | lib/depends.c | 5 | ||||
| -rw-r--r-- | lib/rpminstall.c | 2 |
3 files changed, 4 insertions, 5 deletions
@@ -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 92520e3ab..c8e09c729 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 75d86e552..0f365fcee 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, |