revert always execute file trigger scriptlet callbacks with owning header
This commit is contained in:
parent
801277abbf
commit
19ec5b911b
26
revert-always-execute-file-trigger-scriptlet-callbac.patch
Normal file
26
revert-always-execute-file-trigger-scriptlet-callbac.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From 9680c3f2f8ceeddced6e91048daeb9b93abf4c8d Mon Sep 17 00:00:00 2001
|
||||||
|
From: openEuler Buildteam <buildteam@openeuler.org>
|
||||||
|
Date: Wed, 25 Mar 2020 16:57:29 +0800
|
||||||
|
Subject: [PATCH] revert always execute file trigger scriptlet callbacks with
|
||||||
|
owning header
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/rpmtriggers.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lib/rpmtriggers.c b/lib/rpmtriggers.c
|
||||||
|
index 285b2f0..b7c76e7 100644
|
||||||
|
--- a/lib/rpmtriggers.c
|
||||||
|
+++ b/lib/rpmtriggers.c
|
||||||
|
@@ -437,7 +437,7 @@ static int runHandleTriggersInPkg(rpmts ts, rpmte te, Header h,
|
||||||
|
inputFunc = (char *(*)(void *)) matchFilesNext;
|
||||||
|
rpmScriptSetNextFileFunc(script, inputFunc, mfi);
|
||||||
|
|
||||||
|
- nerrors += runScript(ts, NULL, h, installPrefixes.data,
|
||||||
|
+ nerrors += runScript(ts, te, h, installPrefixes.data,
|
||||||
|
script, 0, -1);
|
||||||
|
rpmtdFreeData(&installPrefixes);
|
||||||
|
rpmScriptFree(script);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
9
rpm.spec
9
rpm.spec
@ -1,6 +1,6 @@
|
|||||||
Name: rpm
|
Name: rpm
|
||||||
Version: 4.15.1
|
Version: 4.15.1
|
||||||
Release: 12
|
Release: 13
|
||||||
Summary: RPM Package Manager
|
Summary: RPM Package Manager
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.rpm.org/
|
URL: http://www.rpm.org/
|
||||||
@ -12,6 +12,7 @@ Patch3: find-debuginfo.sh-decompress-DWARF-compressed-ELF-se.patch
|
|||||||
Patch4: skip-updating-the-preferences.patch
|
Patch4: skip-updating-the-preferences.patch
|
||||||
Patch5: add-dist-to-release-by-default.patch
|
Patch5: add-dist-to-release-by-default.patch
|
||||||
Patch6: Silence-spurious-error-message-from-lsetfilecon-on-E.patch
|
Patch6: Silence-spurious-error-message-from-lsetfilecon-on-E.patch
|
||||||
|
Patch7: revert-always-execute-file-trigger-scriptlet-callbac.patch
|
||||||
|
|
||||||
Patch9000: bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
|
Patch9000: bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
|
||||||
Patch9001: bugfix-rpm-4.14.2-fix-tty-failed.patch
|
Patch9001: bugfix-rpm-4.14.2-fix-tty-failed.patch
|
||||||
@ -282,6 +283,12 @@ make check || (cat tests/rpmtests.log; exit 0)
|
|||||||
%{_mandir}/man1/gendiff.1*
|
%{_mandir}/man1/gendiff.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 25 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-13
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:revert always execute file trigger scriptlet callbacks with owning header
|
||||||
|
|
||||||
* Fri Mar 6 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-12
|
* Fri Mar 6 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-12
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user