folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
jbj 2001-08-31 14:02:13 +00:00
parent 46713343fb
commit 2b23209fce
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -227,6 +227,8 @@
- python: retrofit sha1 digest using RPMTAG_SHA1RHN. - python: retrofit sha1 digest using RPMTAG_SHA1RHN.
- python: change rhnUnload bindings. - python: change rhnUnload bindings.
- python: teach rhnLoad about RPMTAG_SHA1RHN as well. - 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] 4.0 -> 4.0.[12]
- add doxygen and lclint annotations most everywhere. - add doxygen and lclint annotations most everywhere.

5
lib/depends.c
View File

@ -1061,7 +1061,6 @@ alFileSatisfiesDepend(const availableList al,
/** /**
* Check added package file lists for package(s) that have a provide. * 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 al available list
* @param keyType type of dependency * @param keyType type of dependency
* @param keyDepend dependency string representation * @param keyDepend dependency string representation
@ -1082,11 +1081,9 @@ alAllSatisfiesDepend(const availableList al,
if (*keyName == '/') { if (*keyName == '/') {
ret = alAllFileSatisfiesDepend(al, keyType, 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) if (ret != NULL && *ret != NULL)
#endif
return ret; return ret;
} }
if (!al->index.size || al->index.index == NULL) return NULL; if (!al->index.size || al->index.index == NULL) return NULL;

2
lib/rpminstall.c
View File

@ -511,7 +511,7 @@ restart:
rpmProblemSet probs = NULL; rpmProblemSet probs = NULL;
#ifdef FANCY_HASH #ifdef FANCY_HASH
packagesTotal = numRPMS; packagesTotal = numRPMS + numSRPMS;
#endif #endif
rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n")); rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n"));
rc = rpmRunTransactions(ts, rpmShowProgress, rc = rpmRunTransactions(ts, rpmShowProgress,