summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2014-09-12 20:34:04 +0300
committerPanu Matilainen <pmatilai@redhat.com>2014-09-12 20:40:23 +0300
commite5672bfe1606d1ad3c8db3251bbc914ad9e609d5 (patch)
tree4dd744148b25ce3710d52a8db1bdc4f3928c8899
parentb0c53a3d05caf971d69a5a36cb11dc0059cb2204 (diff)
downloadrpm-e5672bfe1606d1ad3c8db3251bbc914ad9e609d5.tar.gz
Dependency refactor whack-a-mole, aka One More Time...
- Commit 0bda2faa4de368a87f85084856a5fed701774acb fixed manual dependencies in rpmspec queryies, but missed automatic self-provides. Add the self-provides before the first round of header dependency population to fix. SIGH. - Another sorta related side-effect is that the exact order of rpmspec output changes as things are now properly sorted, previously it was a mixed bag. (cherry picked from commit 4bc2900baee9ff289dabc47609059accc0f39983)
-rw-r--r--build/parseSpec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 77cf4092f..ea761c98b 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -549,12 +549,12 @@ static void addTargets(Package Pkgs)
headerPutString(pkg->header, RPMTAG_OPTFLAGS, optflags);
/* Add manual dependencies early for rpmspec etc to look at */
+ addPackageProvides(pkg);
for (int i=0; i<PACKAGE_NUM_DEPS; i++) {
rpmdsPutToHeader(pkg->dependencies[i], pkg->header);
}
pkg->ds = rpmdsThis(pkg->header, RPMTAG_REQUIRENAME, RPMSENSE_EQUAL);
- addPackageProvides(pkg);
}
free(platform);
free(arch);