bd93352974
Copy from Base:System/rpm based on submit request 36638 from user oertel OBS-URL: https://build.opensuse.org/request/show/36638 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=95
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
--- ./lib/psm.c.orig 2010-03-26 15:06:20.000000000 +0000
|
|
+++ ./lib/psm.c 2010-03-26 15:11:27.000000000 +0000
|
|
@@ -1318,6 +1318,7 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
|
|
|
|
if (psm->goal == PSM_PKGINSTALL) {
|
|
FD_t payload = NULL;
|
|
+ rpmtransFlags oldtsflags;
|
|
|
|
if (rpmtsFlags(ts) & RPMTRANS_FLAG_JUSTDB) break;
|
|
|
|
@@ -1343,6 +1344,9 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
|
|
break;
|
|
}
|
|
|
|
+ oldtsflags = rpmtsFlags(ts);
|
|
+ if (headerIsEntry(fi->h, RPMTAG_REMOVETID))
|
|
+ (void) rpmtsSetFlags(ts, oldtsflags | RPMTRANS_FLAG_NOMD5);
|
|
rc = fsmSetup(rpmfiFSM(fi), FSM_PKGINSTALL, ts, psm->te, fi,
|
|
payload, NULL, &psm->failedFile);
|
|
(void) rpmswAdd(rpmtsOp(ts, RPMTS_OP_UNCOMPRESS),
|
|
@@ -1350,6 +1354,8 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
|
|
(void) rpmswAdd(rpmtsOp(ts, RPMTS_OP_DIGEST),
|
|
fdOp(payload, FDSTAT_DIGEST));
|
|
xx = fsmTeardown(rpmfiFSM(fi));
|
|
+ if (headerIsEntry(fi->h, RPMTAG_REMOVETID))
|
|
+ (void) rpmtsSetFlags(ts, oldtsflags);
|
|
|
|
saveerrno = errno; /* XXX FIXME: Fclose with libio destroys errno */
|
|
xx = Fclose(payload);
|