diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2014-08-21 16:05:02 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2014-08-26 12:49:11 +0300 |
| commit | 8ea944ca501612c5643c2997f496494c72aca3e7 (patch) | |
| tree | 1ff1da533f4855d654136cdf3ac1cb16fb93bd73 | |
| parent | f0fdc69810f33687e2cb235b817d00bf609b477f (diff) | |
| download | rpm-8ea944ca501612c5643c2997f496494c72aca3e7.tar.gz | |
Revised fix for RhBug:1131892
- Didn't realize there's rpmdsTagTi() now, which is fit for this
purpose and doesn't look as much out of line with the others.
No functional changes here though.
(cherry picked from commit 6ee2468934b45c1c9d1b84b1ba70fe44373425c9)
| -rw-r--r-- | build/pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/pack.c b/build/pack.c index 78a4f0e93..71d75f50c 100644 --- a/build/pack.c +++ b/build/pack.c @@ -617,12 +617,12 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating) headerPutString(pkg->header, RPMTAG_BUILDHOST, buildHost()); headerPutUint32(pkg->header, RPMTAG_BUILDTIME, getBuildTime(), 1); - /* Nuke any previously added dependencies from the header */ - headerDel(pkg->header, RPMTAG_TRIGGERINDEX); for (int i=0; i<PACKAGE_NUM_DEPS; i++) { + /* Nuke any previously added dependencies from the header */ headerDel(pkg->header, rpmdsTagN(pkg->dependencies[i])); headerDel(pkg->header, rpmdsTagEVR(pkg->dependencies[i])); headerDel(pkg->header, rpmdsTagF(pkg->dependencies[i])); + headerDel(pkg->header, rpmdsTagTi(pkg->dependencies[i])); /* ...and add again, now with automatic dependencies included */ rpmdsPutToHeader(pkg->dependencies[i], pkg->header); } |