testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

- fix --runposttrans not working correctly with the --root

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=645
This commit is contained in:
Michael Schröder 2023-10-13 12:26:43 +00:00 committed by Git OBS Bridge
parent f380afba9e
commit 58cabb540e
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
posttrans.diff
View File

@ -1,5 +1,5 @@
--- include/rpm/rpmcli.h.orig 2023-09-19 10:10:10.000000000 +0000
+++ include/rpm/rpmcli.h 2023-10-10 11:58:14.336183145 +0000
+++ include/rpm/rpmcli.h 2023-10-12 11:43:59.662617302 +0000
@@ -306,6 +306,7 @@ enum rpmInstallFlags_e {
INSTALL_ALLMATCHES = (1 << 9), /*!< from --allmatches */
INSTALL_REINSTALL = (1 << 10), /*!< from --reinstall */
@ -24,8 +24,8 @@
*/
extern struct rpmInstallArguments_s rpmIArgs;
--- include/rpm/rpmts.h.orig 2023-10-10 11:58:02.576202795 +0000
+++ include/rpm/rpmts.h 2023-10-10 11:58:14.336183145 +0000
--- include/rpm/rpmts.h.orig 2023-10-12 11:43:35.870664176 +0000
+++ include/rpm/rpmts.h 2023-10-12 11:43:59.662617302 +0000
@@ -253,6 +253,15 @@ int rpmtsOrder(rpmts ts);
int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet);
@ -43,7 +43,7 @@
* @param ts transaction set
* @return new transaction set reference
--- lib/poptI.c.orig 2023-09-19 10:10:10.000000000 +0000
+++ lib/poptI.c 2023-10-10 11:58:14.336183145 +0000
+++ lib/poptI.c 2023-10-12 11:43:59.662617302 +0000
@@ -283,6 +283,10 @@ struct poptOption rpmInstallPoptTable[]
&rpmIArgs.installInterfaceFlags, (INSTALL_RESTORE),
N_("restore package(s)"),
@ -55,8 +55,8 @@
POPT_TABLEEND
};
--- lib/psm.c.orig 2023-10-10 11:58:02.560202822 +0000
+++ lib/psm.c 2023-10-10 11:58:14.336183145 +0000
--- lib/psm.c.orig 2023-10-12 11:43:35.850664215 +0000
+++ lib/psm.c 2023-10-12 11:43:59.662617302 +0000
@@ -1001,7 +1001,7 @@ static rpmRC rpmPackageErase(rpmts ts, r
}
if (rc) break;
@ -67,7 +67,7 @@
rpmtriggersPrepPostUnTransFileTrigs(psm->ts, psm->te);
}
--- lib/rpminstall.c.orig 2023-09-19 10:10:10.000000000 +0000
+++ lib/rpminstall.c 2023-10-10 11:58:14.336183145 +0000
+++ lib/rpminstall.c 2023-10-12 11:43:59.662617302 +0000
@@ -6,6 +6,8 @@
#include <string.h>
@ -111,7 +111,7 @@
+ return rc;
+}
--- lib/rpmtriggers.c.orig 2023-09-19 10:10:10.000000000 +0000
+++ lib/rpmtriggers.c 2023-10-10 11:58:14.340183138 +0000
+++ lib/rpmtriggers.c 2023-10-12 11:43:59.662617302 +0000
@@ -1,5 +1,6 @@
#include "system.h"
@ -161,7 +161,7 @@
priorityTag = RPMTAG_FILETRIGGERPRIORITIES;
} else {
--- lib/rpmtriggers.h.orig 2023-09-19 10:10:10.000000000 +0000
+++ lib/rpmtriggers.h 2023-10-10 11:58:14.340183138 +0000
+++ lib/rpmtriggers.h 2023-10-12 11:43:59.662617302 +0000
@@ -27,6 +27,10 @@ rpmtriggers rpmtriggersCreate(unsigned i
RPM_GNUC_INTERNAL
rpmtriggers rpmtriggersFree(rpmtriggers triggers);
@ -174,7 +174,7 @@
* Prepare post trans uninstall file triggers. After transcation uninstalled
* files are not saved anywhere. So we need during uninstalation of every
--- lib/rpmts_internal.h.orig 2023-09-19 10:10:10.000000000 +0000
+++ lib/rpmts_internal.h 2023-10-10 11:58:14.340183138 +0000
+++ lib/rpmts_internal.h 2023-10-12 11:43:59.662617302 +0000
@@ -94,6 +94,8 @@ struct rpmts_s {
int min_writes; /*!< macro minimize_writes used */
@ -185,7 +185,7 @@
#ifdef __cplusplus
--- lib/transaction.c.orig 2023-09-19 10:10:10.000000000 +0000
+++ lib/transaction.c 2023-10-10 12:00:19.587973127 +0000
+++ lib/transaction.c 2023-10-12 11:44:28.398560689 +0000
@@ -1475,6 +1475,8 @@ static int rpmtsSetup(rpmts ts, rpmprobF
/* Get available space on mounted file systems. */
(void) rpmtsInitDSI(ts);
@ -232,7 +232,7 @@
runTransScripts(ts, PKG_TRANSFILETRIGGERIN);
}
/* Final exit code */
@@ -1901,3 +1907,114 @@ exit:
@@ -1901,3 +1907,117 @@ exit:
sigaction(SIGPIPE, &oact, NULL);
return rc;
}
@ -328,6 +328,9 @@
+ if (!(txn = rpmtxnBegin(ts, RPMTXN_WRITE)))
+ goto exit;
+
+ if (rpmChrootSet(rpmtsRootDir(ts)))
+ goto exit;
+
+ /* run posttrans scripts */
+ rpmlog(RPMLOG_DEBUG, "running post-transaction scripts\n");
+ runTransScripts(ts, PKG_POSTTRANS);
@ -348,7 +351,7 @@
+ return rc;
+}
--- rpm.c.orig 2023-09-19 10:10:10.000000000 +0000
+++ rpm.c 2023-10-10 11:58:14.340183138 +0000
+++ rpm.c 2023-10-12 11:43:59.662617302 +0000
@@ -21,6 +21,7 @@ enum modes {
MODE_ERASE = (1 << 2),
MODE_RESTORE = (1 << 4),

2
rpm.changes
View File

@ -37,6 +37,8 @@ Wed Oct 11 17:07:14 CEST 2023 - mls@suse.de
* rpmsort_reverse.diff
- new file:
* build-aux.tar.bz2 (taken from rpm-4.18)
- fix --runposttrans not working correctly with the --root
option [bnc#1216091]
-------------------------------------------------------------------
Tue Aug 8 12:39:25 UTC 2023 - Dirk Müller <dmueller@suse.com>