rpms
/
rpm
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fix duplicate trigger indexes caused by beta1.3 fix (#1131960)

This commit is contained in:
Panu Matilainen 2014-08-20 15:18:29 +03:00
parent c14ac95363
commit d2ca31c3f6
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rpm-4.12-beta-triggerindex.patch Normal file
View File

@ -0,0 +1,27 @@
commit 1566c18b6efbda7b4c367f4c0ee31b4d5be2d2fe
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Wed Aug 20 15:10:36 2014 +0300
Delete trigger indexes too from header before adding again (RhBug:1131892)
- Fixes regression introduced in the regression-fix
commit 0bda2faa4de368a87f85084856a5fed701774acb, *facepalm*
- Unlike other dependency types, trigger dependencies involve a fourth
tag which we forgot to delete before adding again, causing duplicate
trigger indexes
diff --git a/build/pack.c b/build/pack.c
index 4abca48..78a4f0e 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -617,8 +617,9 @@ 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]));

6
rpm.spec
View File

@ -27,7 +27,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}4%{?dist}
Release: %{?snapver:0.%{snapver}.}5%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@ -50,6 +50,7 @@ Patch4: rpm-4.8.1-use-gpg2.patch
# Patches already upstream:
Patch100: rpm-4.12-beta1-fix-buildrequires.patch
Patch101: rpm-4.12-beta1-spec-header-deps.patch
Patch102: rpm-4.12-beta-triggerindex.patch
# These are not yet upstream
# Emergency hack for rpmdeps crash (#1131892)
@ -530,6 +531,9 @@ exit 0
%doc doc/librpm/html/*
%changelog
* Wed Aug 20 2014 Panu Matilainen <pmatilai@redhat.com> - 4.12.0-0.beta1.5
- Fix duplicate trigger indexes caused by beta1.3 fix (#1131960)
* Wed Aug 20 2014 Panu Matilainen <pmatilai@redhat.com> - 4.12.0-0.beta1.4
- Emergency hack for #1131892