pool/rpm
SHA256
11
0
Fork 2
Code Issues Pull Requests Activity

Compare commits

base: pool:slfo-1.2
Branches Tags
pool:factory pool:devel pool:slfo-1.2 pool:slfo-main
..
compare: pool:factory
Branches Tags
pool:factory pool:devel pool:slfo-1.2 pool:slfo-main

2 Commits
slfo-1.2 ... factory

Author SHA256 Message Date
Dominique Leuenberger
5aef7e908e Accepting request 1296339 from Base:System 
- flush scriptlet notification messages in --runposttrans

OBS-URL: https://build.opensuse.org/request/show/1296339
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=325
 2025-07-31 15:45:51 +00:00
Michael Schröder
cd48b8d6e6 - flush scriptlet notification messages in --runposttrans 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=710
 2025-07-29 14:18:17 +00:00
3 changed files with 27 additions and 16 deletions
Expand all files Collapse all files

34
posttrans.diff
View File

@@ -1,5 +1,5 @@
--- include/rpm/rpmcli.h.orig 2025-02-19 15:29:33.000000000 +0000 --- include/rpm/rpmcli.h.orig 2025-02-19 15:29:33.000000000 +0000
+++ include/rpm/rpmcli.h 2025-05-19 13:58:25.952973533 +0000 +++ include/rpm/rpmcli.h 2025-07-29 14:13:12.907099597 +0000
@@ -306,6 +306,7 @@ enum rpmInstallFlags_e { @@ -306,6 +306,7 @@ enum rpmInstallFlags_e {
INSTALL_ALLMATCHES = (1 << 9), /*!< from --allmatches */ INSTALL_ALLMATCHES = (1 << 9), /*!< from --allmatches */
INSTALL_REINSTALL = (1 << 10), /*!< from --reinstall */ INSTALL_REINSTALL = (1 << 10), /*!< from --reinstall */
@@ -24,8 +24,8 @@
*/ */
extern struct rpmInstallArguments_s rpmIArgs; extern struct rpmInstallArguments_s rpmIArgs;
--- include/rpm/rpmts.h.orig 2025-05-19 13:58:13.800993465 +0000 --- include/rpm/rpmts.h.orig 2025-07-29 14:13:01.139113390 +0000
+++ include/rpm/rpmts.h 2025-05-19 13:58:25.952973533 +0000 +++ include/rpm/rpmts.h 2025-07-29 14:13:12.907099597 +0000
@@ -253,6 +253,15 @@ int rpmtsOrder(rpmts ts); @@ -253,6 +253,15 @@ int rpmtsOrder(rpmts ts);
int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet); int rpmtsRun(rpmts ts, rpmps okProbs, rpmprobFilterFlags ignoreSet);
@@ -43,7 +43,7 @@
* @param ts transaction set * @param ts transaction set
* @return new transaction set reference * @return new transaction set reference
--- lib/poptI.c.orig 2025-02-19 15:29:33.000000000 +0000 --- lib/poptI.c.orig 2025-02-19 15:29:33.000000000 +0000
+++ lib/poptI.c 2025-05-19 13:58:25.952973533 +0000 +++ lib/poptI.c 2025-07-29 14:13:12.907099597 +0000
@@ -283,6 +283,10 @@ struct poptOption rpmInstallPoptTable[] @@ -283,6 +283,10 @@ struct poptOption rpmInstallPoptTable[]
&rpmIArgs.installInterfaceFlags, (INSTALL_RESTORE), &rpmIArgs.installInterfaceFlags, (INSTALL_RESTORE),
N_("restore package(s)"), N_("restore package(s)"),
@@ -55,8 +55,8 @@
POPT_TABLEEND POPT_TABLEEND
}; };
--- lib/psm.c.orig 2025-05-19 13:58:13.780993499 +0000 --- lib/psm.c.orig 2025-07-29 14:13:01.119113413 +0000
+++ lib/psm.c 2025-05-19 14:32:29.713648565 +0000 +++ lib/psm.c 2025-07-29 14:13:12.907099597 +0000
@@ -612,6 +612,8 @@ static int isUpdate(rpmts ts, rpmte te) @@ -612,6 +612,8 @@ static int isUpdate(rpmts ts, rpmte te)
rpmtsi pi = rpmtsiInit(ts); rpmtsi pi = rpmtsiInit(ts);
rpmte p; rpmte p;
@@ -76,7 +76,7 @@
rpmtriggersPrepPostUnTransFileTrigs(psm->ts, psm->te); rpmtriggersPrepPostUnTransFileTrigs(psm->ts, psm->te);
} }
--- lib/rpminstall.c.orig 2025-02-19 15:29:33.000000000 +0000 --- lib/rpminstall.c.orig 2025-02-19 15:29:33.000000000 +0000
+++ lib/rpminstall.c 2025-05-19 13:58:25.952973533 +0000 +++ lib/rpminstall.c 2025-07-29 14:13:56.519048463 +0000
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
#include <string.h> #include <string.h>
@@ -111,7 +111,7 @@
void * rpmShowProgress(const void * arg, void * rpmShowProgress(const void * arg,
const rpmCallbackType what, const rpmCallbackType what,
const rpm_loff_t amount, const rpm_loff_t amount,
@@ -213,8 +233,20 @@ void * rpmShowProgress(const void * arg, @@ -213,8 +233,22 @@ void * rpmShowProgress(const void * arg,
case RPMCALLBACK_CPIO_ERROR: case RPMCALLBACK_CPIO_ERROR:
break; break;
case RPMCALLBACK_SCRIPT_ERROR: case RPMCALLBACK_SCRIPT_ERROR:
@@ -119,6 +119,7 @@
+ rpmTagVal stag = (rpmTagVal)amount; + rpmTagVal stag = (rpmTagVal)amount;
+ char *s = headerGetAsString(h, RPMTAG_NEVRA); + char *s = headerGetAsString(h, RPMTAG_NEVRA);
+ fprintf(stdout, "Error from %%%s(%s)\n", posttranstag2str(stag), s); + fprintf(stdout, "Error from %%%s(%s)\n", posttranstag2str(stag), s);
+ (void) fflush(stdout);
+ free(s); + free(s);
+ } + }
break; break;
@@ -127,12 +128,13 @@
+ rpmTagVal stag = (rpmTagVal)amount; + rpmTagVal stag = (rpmTagVal)amount;
+ char *s = headerGetAsString(h, RPMTAG_NEVRA); + char *s = headerGetAsString(h, RPMTAG_NEVRA);
+ fprintf(stdout, "Running %%%s(%s)\n", posttranstag2str(stag), s); + fprintf(stdout, "Running %%%s(%s)\n", posttranstag2str(stag), s);
+ (void) fflush(stdout);
+ free(s); + free(s);
+ } + }
break; break;
case RPMCALLBACK_SCRIPT_STOP: case RPMCALLBACK_SCRIPT_STOP:
break; break;
@@ -831,3 +863,33 @@ int rpmInstallSource(rpmts ts, const cha @@ -831,3 +865,33 @@ int rpmInstallSource(rpmts ts, const cha
return rc; return rc;
} }
@@ -166,8 +168,8 @@
+ argvFree(manifest); + argvFree(manifest);
+ return rc; + return rc;
+} +}
--- lib/rpmte_internal.h.orig 2025-05-19 14:17:38.131089552 +0000 --- lib/rpmte_internal.h.orig 2025-02-19 15:29:33.000000000 +0000
+++ lib/rpmte_internal.h 2025-05-19 14:18:06.503043382 +0000 +++ lib/rpmte_internal.h 2025-07-29 14:13:12.907099597 +0000
@@ -32,6 +32,7 @@ enum addOp_e { @@ -32,6 +32,7 @@ enum addOp_e {
RPMTE_UPGRADE = 1, RPMTE_UPGRADE = 1,
RPMTE_REINSTALL = 2, RPMTE_REINSTALL = 2,
@@ -177,7 +179,7 @@
/** \ingroup rpmte /** \ingroup rpmte
--- lib/rpmtriggers.c.orig 2025-02-19 15:29:33.000000000 +0000 --- lib/rpmtriggers.c.orig 2025-02-19 15:29:33.000000000 +0000
+++ lib/rpmtriggers.c 2025-05-19 14:36:21.781275493 +0000 +++ lib/rpmtriggers.c 2025-07-29 14:13:12.907099597 +0000
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
#include "system.h" #include "system.h"
@@ -252,7 +254,7 @@
priorityTag = RPMTAG_FILETRIGGERPRIORITIES; priorityTag = RPMTAG_FILETRIGGERPRIORITIES;
} else { } else {
--- lib/rpmtriggers.h.orig 2025-02-19 15:29:33.000000000 +0000 --- lib/rpmtriggers.h.orig 2025-02-19 15:29:33.000000000 +0000
+++ lib/rpmtriggers.h 2025-05-19 13:58:25.956973525 +0000 +++ lib/rpmtriggers.h 2025-07-29 14:13:12.907099597 +0000
@@ -24,6 +24,10 @@ rpmtriggers rpmtriggersCreate(unsigned i @@ -24,6 +24,10 @@ rpmtriggers rpmtriggersCreate(unsigned i
RPM_GNUC_INTERNAL RPM_GNUC_INTERNAL
rpmtriggers rpmtriggersFree(rpmtriggers triggers); rpmtriggers rpmtriggersFree(rpmtriggers triggers);
@@ -265,7 +267,7 @@
* Prepare post trans uninstall file triggers. After transcation uninstalled * Prepare post trans uninstall file triggers. After transcation uninstalled
* files are not saved anywhere. So we need during uninstalation of every * files are not saved anywhere. So we need during uninstalation of every
--- lib/rpmts_internal.h.orig 2025-02-19 15:29:33.000000000 +0000 --- lib/rpmts_internal.h.orig 2025-02-19 15:29:33.000000000 +0000
+++ lib/rpmts_internal.h 2025-05-19 13:58:25.956973525 +0000 +++ lib/rpmts_internal.h 2025-07-29 14:13:12.907099597 +0000
@@ -83,6 +83,8 @@ struct rpmts_s { @@ -83,6 +83,8 @@ struct rpmts_s {
int min_writes; /*!< macro minimize_writes used */ int min_writes; /*!< macro minimize_writes used */
@@ -276,7 +278,7 @@
/** \ingroup rpmts /** \ingroup rpmts
--- lib/transaction.c.orig 2025-02-19 15:29:33.000000000 +0000 --- lib/transaction.c.orig 2025-02-19 15:29:33.000000000 +0000
+++ lib/transaction.c 2025-05-21 13:35:19.931704634 +0000 +++ lib/transaction.c 2025-07-29 14:13:12.907099597 +0000
@@ -1475,6 +1475,8 @@ static int rpmtsSetup(rpmts ts, rpmprobF @@ -1475,6 +1475,8 @@ static int rpmtsSetup(rpmts ts, rpmprobF
/* Get available space on mounted file systems. */ /* Get available space on mounted file systems. */
(void) rpmtsInitDSI(ts); (void) rpmtsInitDSI(ts);
@@ -425,7 +427,7 @@
+ return rc; + return rc;
+} +}
--- tools/rpm.c.orig 2025-02-19 15:29:33.000000000 +0000 --- tools/rpm.c.orig 2025-02-19 15:29:33.000000000 +0000
+++ tools/rpm.c 2025-05-19 13:58:25.956973525 +0000 +++ tools/rpm.c 2025-07-29 14:13:12.907099597 +0000
@@ -21,6 +21,7 @@ enum modes { @@ -21,6 +21,7 @@ enum modes {
MODE_ERASE = (1 << 2), MODE_ERASE = (1 << 2),
MODE_RESTORE = (1 << 4), MODE_RESTORE = (1 << 4),

8
rpm.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 29 16:15:58 CEST 2025 - mls@suse.de
- flush scriptlet notification messages in --runposttrans
* needed to fix leaking tmp files [bsc#1218459]
* updated patch: posttrans.diff
* added "rpm_flushes_runposttrans" provides for libzypp
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 2 15:07:06 CEST 2025 - mls@suse.de Mon Jun 2 15:07:06 CEST 2025 - mls@suse.de

1
rpm.spec
View File

@@ -52,6 +52,7 @@ BuildRequires: xz-devel
BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(libzstd)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
#!BuildIgnore: rpmlint-Factory #!BuildIgnore: rpmlint-Factory
Provides: rpm_flushes_runposttrans
Provides: rpminst Provides: rpminst
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
Requires: rpm-config-SUSE Requires: rpm-config-SUSE