mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-23 18:33:04 +00:00
Drop unneeded patch
This commit is contained in:
Denis Silakov
parent
12d2405d8b
commit
9936b05b80
1 changed files with 0 additions and 847 deletions
|
|
@ -1,847 +0,0 @@
|
|||
--- rpm-5.4.15/build/parseReqs.c.trigtrans~ 2014-09-05 06:44:52.694095488 +0200
|
||||
+++ rpm-5.4.15/build/parseReqs.c 2014-09-05 06:44:52.724095787 +0200
|
||||
@@ -66,6 +66,22 @@ rpmRC parseRCPOT(Spec spec, Package pkg,
|
||||
tagflags |= RPMSENSE_TRIGGERUN;
|
||||
h = pkg->header;
|
||||
break;
|
||||
+ case RPMTAG_TRIGGERPRETRANSIN:
|
||||
+ tagflags |= (RPMSENSE_TRIGGERTRANS | RPMSENSE_TRIGGERPREIN);
|
||||
+ h = pkg->header;
|
||||
+ break;
|
||||
+ case RPMTAG_TRIGGERPRETRANSUN:
|
||||
+ tagflags |= (RPMSENSE_TRIGGERTRANS | RPMSENSE_TRIGGERUN);
|
||||
+ h = pkg->header;
|
||||
+ break;
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSIN:
|
||||
+ tagflags |= (RPMSENSE_TRIGGERTRANS | RPMSENSE_TRIGGERIN);
|
||||
+ h = pkg->header;
|
||||
+ break;
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSUN:
|
||||
+ tagflags |= (RPMSENSE_TRIGGERTRANS | RPMSENSE_TRIGGERPOSTUN);
|
||||
+ h = pkg->header;
|
||||
+ break;
|
||||
case RPMTAG_BUILDSUGGESTS:
|
||||
case RPMTAG_BUILDENHANCES:
|
||||
tagflags |= RPMSENSE_MISSINGOK;
|
||||
--- rpm-5.4.15/build/parseScript.c.trigtrans~ 2014-09-05 06:44:52.697428855 +0200
|
||||
+++ rpm-5.4.15/build/parseScript.c 2014-09-05 06:44:52.724095787 +0200
|
||||
@@ -181,6 +181,34 @@ int parseScript(Spec spec, int parsePart
|
||||
progtag = RPMTAG_TRIGGERSCRIPTPROG;
|
||||
partname = "%triggerpostun";
|
||||
break;
|
||||
+ case PART_TRIGGERPRETRANSIN:
|
||||
+ tag = RPMTAG_TRIGGERSCRIPTS;
|
||||
+ tagflags = 0;
|
||||
+ reqtag = RPMTAG_TRIGGERPRETRANSIN;
|
||||
+ progtag = RPMTAG_TRIGGERSCRIPTPROG;
|
||||
+ partname = "%triggerpretransin";
|
||||
+ break;
|
||||
+ case PART_TRIGGERPRETRANSUN:
|
||||
+ tag = RPMTAG_TRIGGERSCRIPTS;
|
||||
+ tagflags = 0;
|
||||
+ reqtag = RPMTAG_TRIGGERPRETRANSUN;
|
||||
+ progtag = RPMTAG_TRIGGERSCRIPTPROG;
|
||||
+ partname = "%triggerpretransun";
|
||||
+ break;
|
||||
+ case PART_TRIGGERPOSTTRANSIN:
|
||||
+ tag = RPMTAG_TRIGGERSCRIPTS;
|
||||
+ tagflags = 0;
|
||||
+ reqtag = RPMTAG_TRIGGERPOSTTRANSIN;
|
||||
+ progtag = RPMTAG_TRIGGERSCRIPTPROG;
|
||||
+ partname = "%triggerposttransin";
|
||||
+ break;
|
||||
+ case PART_TRIGGERPOSTTRANSUN:
|
||||
+ tag = RPMTAG_TRIGGERSCRIPTS;
|
||||
+ tagflags = 0;
|
||||
+ reqtag = RPMTAG_TRIGGERPOSTTRANSUN;
|
||||
+ progtag = RPMTAG_TRIGGERSCRIPTPROG;
|
||||
+ partname = "%triggerposttransun";
|
||||
+ break;
|
||||
/* support "%sanitycheck" script/section */
|
||||
case PART_SANITYCHECK:
|
||||
tag = RPMTAG_SANITYCHECK;
|
||||
--- rpm-5.4.15/build/parseSpec.c.trigtrans~ 2014-09-05 06:44:52.607427959 +0200
|
||||
+++ rpm-5.4.15/build/parseSpec.c 2014-09-05 06:44:52.724095787 +0200
|
||||
@@ -47,6 +47,10 @@ static struct PartRec {
|
||||
{ PART_TRIGGERUN, 0, "%triggerun"},
|
||||
{ PART_TRIGGERIN, 0, "%triggerin"},
|
||||
{ PART_TRIGGERIN, 0, "%trigger"},
|
||||
+ { PART_TRIGGERPRETRANSIN,0, "%triggerpretransin"},
|
||||
+ { PART_TRIGGERPRETRANSUN,0, "%triggerpretransun"},
|
||||
+ { PART_TRIGGERPOSTTRANSIN,0, "%triggerposttransin"},
|
||||
+ { PART_TRIGGERPOSTTRANSUN,0, "%triggerposttransun"},
|
||||
{ PART_VERIFYSCRIPT, 0, "%verifyscript"},
|
||||
{ PART_SANITYCHECK, 0, "%sanitycheck"}, /* support "%sanitycheck" scriptlet */
|
||||
{0, 0, NULL}
|
||||
@@ -608,6 +612,10 @@ int parseSpec(rpmts ts, const char *spec
|
||||
case PART_TRIGGERIN:
|
||||
case PART_TRIGGERUN:
|
||||
case PART_TRIGGERPOSTUN:
|
||||
+ case PART_TRIGGERPRETRANSIN:
|
||||
+ case PART_TRIGGERPRETRANSUN:
|
||||
+ case PART_TRIGGERPOSTTRANSIN:
|
||||
+ case PART_TRIGGERPOSTTRANSUN:
|
||||
parsePart = parseScript(spec, parsePart);
|
||||
/*@switchbreak@*/ break;
|
||||
|
||||
--- rpm-5.4.15/build/rpmbuild.h.trigtrans~ 2010-02-10 19:36:17.000000000 +0100
|
||||
+++ rpm-5.4.15/build/rpmbuild.h 2014-09-05 06:44:52.724095787 +0200
|
||||
@@ -76,10 +76,14 @@ typedef enum rpmParseState_e {
|
||||
PART_BUILDARCHITECTURES= 29+PART_BASE,/*!< */
|
||||
PART_TRIGGERPOSTUN = 30+PART_BASE, /*!< */
|
||||
PART_TRIGGERPREIN = 31+PART_BASE, /*!< */
|
||||
+ PART_TRIGGERPRETRANSIN= 32+PART_BASE, /*!< */
|
||||
+ PART_TRIGGERPRETRANSUN= 33+PART_BASE, /*!< */
|
||||
+ PART_TRIGGERPOSTTRANSIN= 34+PART_BASE, /*!< */
|
||||
+ PART_TRIGGERPOSTTRANSUN= 35+PART_BASE, /*!< */
|
||||
/* support "%sanitycheck" script */
|
||||
- PART_SANITYCHECK = 32+PART_BASE, /*!< */
|
||||
- PART_ARBITRARY = 33+PART_BASE, /*!< */
|
||||
- PART_LAST = 34+PART_BASE /*!< */
|
||||
+ PART_SANITYCHECK = 36+PART_BASE, /*!< */
|
||||
+ PART_ARBITRARY = 37+PART_BASE, /*!< */
|
||||
+ PART_LAST = 38+PART_BASE /*!< */
|
||||
} rpmParseState;
|
||||
|
||||
/** \ingroup rpmbuild
|
||||
--- rpm-5.4.15/lib/psm.c.trigtrans~ 2014-09-05 06:44:52.704095588 +0200
|
||||
+++ rpm-5.4.15/lib/psm.c 2014-09-05 06:45:30.931142793 +0200
|
||||
@@ -59,6 +59,7 @@
|
||||
}
|
||||
|
||||
#define _RPMEVR_INTERNAL
|
||||
+#define _RPMDS_INTERNAL
|
||||
#include "rpmds.h"
|
||||
|
||||
#define _RPMTE_INTERNAL
|
||||
@@ -404,6 +405,10 @@ static /*@observer@*/ const char * tag2s
|
||||
case RPMTAG_POSTUN: return "%postun";
|
||||
case RPMTAG_POSTTRANS: return "%posttrans";
|
||||
case RPMTAG_TRIGGERPOSTUN: return "%triggerpostun";
|
||||
+ case RPMTAG_TRIGGERPRETRANSIN: return "%triggerpretransin";
|
||||
+ case RPMTAG_TRIGGERPRETRANSUN: return "%triggerpretransun";
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSIN: return "%triggerposttransin";
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSUN: return "%triggerposttransun";
|
||||
case RPMTAG_VERIFYSCRIPT: return "%verify";
|
||||
case RPMTAG_SANITYCHECK: return "%sanitycheck";
|
||||
case RPMTAG_BUILDPREP: return "%prep";
|
||||
@@ -434,6 +439,10 @@ static rpmScriptID tag2slx(rpmTag tag)
|
||||
case RPMTAG_POSTUN: return RPMSCRIPT_POSTUN;
|
||||
case RPMTAG_POSTTRANS: return RPMSCRIPT_POSTTRANS;
|
||||
case RPMTAG_TRIGGERPOSTUN: return RPMSCRIPT_TRIGGERPOSTUN;
|
||||
+ case RPMTAG_TRIGGERPRETRANSIN: return RPMSCRIPT_TRIGGERPRETRANSIN;
|
||||
+ case RPMTAG_TRIGGERPRETRANSUN: return RPMSCRIPT_TRIGGERPRETRANSUN;
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSIN: return RPMSCRIPT_TRIGGERPOSTTRANSIN;
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSUN: return RPMSCRIPT_TRIGGERPOSTTRANSUN;
|
||||
case RPMTAG_VERIFYSCRIPT: return RPMSCRIPT_VERIFY;
|
||||
case RPMTAG_SANITYCHECK: return RPMSCRIPT_SANITYCHECK;
|
||||
case RPMTAG_BUILDPREP: return RPMSCRIPT_PREP;
|
||||
@@ -1279,7 +1288,6 @@ static rpmRC handleOneTrigger(const rpmp
|
||||
rpmds Fds = NULL;
|
||||
rpmds Dds = NULL;
|
||||
rpmds Pds = NULL;
|
||||
- const char * sourceName;
|
||||
const char * triggerName;
|
||||
rpmRC rc = RPMRC_OK;
|
||||
int arg1;
|
||||
@@ -1287,10 +1295,6 @@ static rpmRC handleOneTrigger(const rpmp
|
||||
int i;
|
||||
|
||||
he->tag = RPMTAG_NAME;
|
||||
- xx = headerGet(sourceH, he, 0);
|
||||
- sourceName = he->p.str;
|
||||
-
|
||||
- he->tag = RPMTAG_NAME;
|
||||
xx = headerGet(triggeredH, he, 0);
|
||||
triggerName = he->p.str;
|
||||
|
||||
@@ -1428,7 +1432,6 @@ exit:
|
||||
She->p.ptr = _free(She->p.ptr);
|
||||
Phe->p.ptr = _free(Phe->p.ptr);
|
||||
triggerName = _free(triggerName);
|
||||
- sourceName = _free(sourceName);
|
||||
|
||||
return rc;
|
||||
}
|
||||
@@ -1749,6 +1752,348 @@ exit:
|
||||
return rc;
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * Return transaction element's file info.
|
||||
+ * @todo Take a rpmfi refcount here.
|
||||
+ * @param tsi transaction element iterator
|
||||
+ * @return transaction element file info
|
||||
+ */
|
||||
+static /*@null@*/
|
||||
+rpmfi rpmtsiFi(const rpmtsi tsi)
|
||||
+ /*@*/
|
||||
+{
|
||||
+ rpmfi fi = NULL;
|
||||
+
|
||||
+ if (tsi != NULL && tsi->ocsave != -1) {
|
||||
+ /*@-type -abstract@*/ /* FIX: rpmte not opaque */
|
||||
+ rpmte te = rpmtsElement(tsi->ts, tsi->ocsave);
|
||||
+ /*@-assignexpose@*/
|
||||
+ if (te != NULL && (fi = te->fi) != NULL)
|
||||
+ fi->te = te;
|
||||
+ /*@=assignexpose@*/
|
||||
+ /*@=type =abstract@*/
|
||||
+ }
|
||||
+ /*@-compdef -refcounttrans -usereleased @*/
|
||||
+ return fi;
|
||||
+ /*@=compdef =refcounttrans =usereleased @*/
|
||||
+}
|
||||
+/**
|
||||
+ * Execute triggers.
|
||||
+ * @param psm package state machine data
|
||||
+ * @param sourceH
|
||||
+ * @param triggeredH
|
||||
+ * @param arg2
|
||||
+ * @return RPMRC_OK on success
|
||||
+ */
|
||||
+static rpmRC handleOneScriptTrigger(const rpmpsm psm,
|
||||
+ rpmds sourceDs, Header triggeredH, int arg2)
|
||||
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState@*/
|
||||
+ /*@modifies psm, sourceH, triggeredH,
|
||||
+ rpmGlobalMacroContext, fileSystem, internalState @*/
|
||||
+{
|
||||
+ static int scareMem = 0;
|
||||
+ HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
|
||||
+ HE_t Ihe = memset(alloca(sizeof(*Ihe)), 0, sizeof(*Ihe));
|
||||
+ HE_t She = memset(alloca(sizeof(*She)), 0, sizeof(*She));
|
||||
+ HE_t Phe = memset(alloca(sizeof(*Phe)), 0, sizeof(*Phe));
|
||||
+ miRE mire = NULL;
|
||||
+ const rpmts ts = psm->ts;
|
||||
+ rpmds Tds = NULL;
|
||||
+ const char * triggerName;
|
||||
+ rpmRC rc = RPMRC_OK;
|
||||
+ int arg1;
|
||||
+ int xx;
|
||||
+ int i;
|
||||
+
|
||||
+ he->tag = RPMTAG_NAME;
|
||||
+ xx = headerGet(triggeredH, he, 0);
|
||||
+ triggerName = he->p.str;
|
||||
+
|
||||
+ arg1 = rpmdbCountPackages(rpmtsGetRdb(ts), triggerName);
|
||||
+ if (arg1 < 0) {
|
||||
+ /* XXX W2DO? fails as "execution of script failed" */
|
||||
+ rc = RPMRC_FAIL;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ arg1 += psm->countCorrection;
|
||||
+
|
||||
+ Tds = rpmdsNew(triggeredH, RPMTAG_TRIGGERNAME, scareMem);
|
||||
+ if (Tds == NULL)
|
||||
+ goto exit;
|
||||
+ xx = rpmdsSetNoPromote(Tds, 1);
|
||||
+
|
||||
+ Ihe->tag = RPMTAG_TRIGGERINDEX;
|
||||
+ if (!headerGet(triggeredH, Ihe, 0))
|
||||
+ goto exit;
|
||||
+
|
||||
+ She->tag = RPMTAG_TRIGGERSCRIPTS;
|
||||
+ if (!headerGet(triggeredH, She, 0))
|
||||
+ goto exit;
|
||||
+
|
||||
+ Phe->tag = RPMTAG_TRIGGERSCRIPTPROG;
|
||||
+ if (!headerGet(triggeredH, Phe, 0))
|
||||
+ goto exit;
|
||||
+
|
||||
+ if ((Tds = rpmdsInit(Tds)) != NULL)
|
||||
+ while ((i = rpmdsNext(Tds)) >= 0) {
|
||||
+ rpmuint32_t Flags = rpmdsFlags(Tds);
|
||||
+ char * depName;
|
||||
+ ARGV_t matches = NULL;
|
||||
+ int bingo;
|
||||
+
|
||||
+ /* Skip triggers that are not in this context. */
|
||||
+ if (!((Flags & psm->sense) & RPMSENSE_TRIGGERTRANS))
|
||||
+ continue;
|
||||
+
|
||||
+ bingo = 0; /* no trigger to fire. */
|
||||
+ depName = (char *) rpmdsN(Tds);
|
||||
+ if (rpmdsTagN(sourceDs) == RPMTAG_BASENAMES || rpmdsTagN(sourceDs) == RPMTAG_DIRNAMES) {
|
||||
+ if (mire == NULL)
|
||||
+ mire = mireNew(depName[0] == '^' ? RPMMIRE_PCRE : RPMMIRE_GLOB, 0);
|
||||
+
|
||||
+ xx = mireRegcomp(mire, depName);
|
||||
+ for(rpmdsSetIx(sourceDs, 0);
|
||||
+ rpmdsIx(sourceDs) < rpmdsCount(sourceDs);
|
||||
+ rpmdsSetIx(sourceDs, rpmdsIx(sourceDs)+1)) {
|
||||
+ char * N = (char *) sourceDs->N[sourceDs->i];
|
||||
+ xx = mireRegexec(mire, N, 0);
|
||||
+ if (xx < 0)
|
||||
+ /*@innercontinue@*/ continue;
|
||||
+ bingo = 1;
|
||||
+ if (_psm_debug)
|
||||
+ rpmlog(RPMLOG_DEBUG, "--> %s:%d bingo! N: %s\n", __FUNCTION__, __LINE__, N);
|
||||
+
|
||||
+ argvAdd(&matches, N);
|
||||
+ }
|
||||
+ xx = mireClean(mire);
|
||||
+ /* If trigger not fired yet, try provided dependency match. */
|
||||
+ } else {
|
||||
+ bingo = rpmdsMatch(Tds, sourceDs);
|
||||
+ bingo = rpmdsNegateRC(Tds, bingo);
|
||||
+ }
|
||||
+
|
||||
+ if (!bingo)
|
||||
+ continue;
|
||||
+
|
||||
+ /* Coerce strings into header argv return. */
|
||||
+ { int index = Ihe->p.ui32p[i];
|
||||
+ const char * s = Phe->p.argv[index];
|
||||
+ char * t;
|
||||
+
|
||||
+ he->tag = Phe->tag;
|
||||
+ he->t = RPM_STRING_ARRAY_TYPE;
|
||||
+ he->c = 1;
|
||||
+ he->p.argv = xmalloc(sizeof(Phe->p.argv[0]) + strlen(s) + 1);
|
||||
+ he->p.argv[0] = t = (char *) &he->p.argv[1];
|
||||
+ t = stpcpy(t, s);
|
||||
+ *t = '\0';
|
||||
+
|
||||
+ rc |= runScript(psm, triggeredH, "%trigger", he,
|
||||
+ She->p.argv[index], arg1, arg2, matches);
|
||||
+ if (_psm_debug)
|
||||
+ rpmlog(RPMLOG_DEBUG, "--> %s:%d runScript: %s arg1: %d arg2: %d matches: %d rc: %d\n", __FUNCTION__, __LINE__, She->p.argv[index], arg1, arg2, matches, rc);
|
||||
+
|
||||
+ he->p.ptr = _free(he->p.ptr);
|
||||
+ }
|
||||
+ argvFree(matches);
|
||||
+ }
|
||||
+
|
||||
+ mire = mireFree(mire);
|
||||
+ (void)rpmdsFree(Tds);
|
||||
+ Tds = NULL;
|
||||
+
|
||||
+exit:
|
||||
+ Ihe->p.ptr = _free(Ihe->p.ptr);
|
||||
+ She->p.ptr = _free(She->p.ptr);
|
||||
+ Phe->p.ptr = _free(Phe->p.ptr);
|
||||
+ triggerName = _free(triggerName);
|
||||
+
|
||||
+ return rc;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * Run a dependency set loop against rpmdb triggers.
|
||||
+ * @param psm package state machine data
|
||||
+ * @param tagno dependency set to run against rpmdb
|
||||
+ * @param arg2 scriptlet arg2
|
||||
+ * @return RPMRC_OK on success
|
||||
+ */
|
||||
+static rpmRC runScriptTriggersLoop(rpmpsm psm, rpmTag tagno, int arg2)
|
||||
+ /*@globals rpmGlobalMacroContext, h_errno,
|
||||
+ fileSystem, internalState @*/
|
||||
+ /*@modifies psm, rpmGlobalMacroContext,
|
||||
+ fileSystem, internalState @*/
|
||||
+{
|
||||
+ static int scareMem = 0;
|
||||
+ const rpmts ts = psm->ts;
|
||||
+ rpmfi fi = NULL;
|
||||
+ rpmds sourceDs = memset(alloca(sizeof(*sourceDs)), 0, sizeof(*sourceDs));
|
||||
+ char * depName = NULL;
|
||||
+ char * evr;
|
||||
+ char * ptr = NULL;
|
||||
+ ARGI_t instances = NULL;
|
||||
+ rpmmi mi;
|
||||
+ Header triggeredH;
|
||||
+ rpmRC rc = RPMRC_OK;
|
||||
+ int xx;
|
||||
+ rpmtsi pi;
|
||||
+ rpmte p = NULL;
|
||||
+ int n;
|
||||
+
|
||||
+ if (tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES)
|
||||
+ n = (psm->goal == PSM_PKGINSTALL) ? ts->numAddedFiles : ts->numErasedFiles;
|
||||
+ else
|
||||
+ n = ts->orderCount;
|
||||
+
|
||||
+ evr = memset(alloca(n * 64 * sizeof(*evr)), 0, n * 64 * sizeof(*evr));
|
||||
+ ptr = evr;
|
||||
+ sourceDs->tagN = tagno;
|
||||
+ sourceDs->Type = tagName(tagno);
|
||||
+ sourceDs->Count = n;
|
||||
+ sourceDs->i = -1;
|
||||
+ sourceDs->N = memset(alloca(n * sizeof(*sourceDs->N)), 0, n * sizeof(*sourceDs->N));
|
||||
+ sourceDs->EVR = memset(alloca(n * sizeof(*sourceDs->EVR)), 0, n * sizeof(*sourceDs->EVR));
|
||||
+ sourceDs->Flags = (evrFlags *) memset(alloca(n * sizeof(*sourceDs->Flags)), 0, n * sizeof(*sourceDs->Flags));
|
||||
+
|
||||
+ pi = rpmtsiInit(ts);
|
||||
+ while ((p = rpmtsiNext(pi, psm->goal == PSM_PKGINSTALL ? TR_ADDED : TR_REMOVED)) != NULL) {
|
||||
+ if (p->isSource) continue;
|
||||
+ if ((fi = rpmtsiFi(pi)) == NULL)
|
||||
+ continue;
|
||||
+ if (tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES) {
|
||||
+ fi = rpmfiInit(fi, 0);
|
||||
+ if (fi != NULL) {
|
||||
+ while (rpmfiNext(fi) >= 0) {
|
||||
+ sourceDs->N[++sourceDs->i] = (tagno == RPMTAG_DIRNAMES ? rpmfiDN(fi) : rpmfiFN(fi));
|
||||
+ }
|
||||
+ }
|
||||
+ } else {
|
||||
+ char *ptr = evr;
|
||||
+ if (rpmteE(p)) ptr = stpcpy(stpcpy(ptr, rpmteE(p)), ":");
|
||||
+ ptr = stpcpy(stpcpy(stpcpy(ptr, rpmteV(p)), "-"), rpmteR(p));
|
||||
+ if (rpmteD(p)) ptr = stpcpy(stpcpy(ptr, ":"), rpmteD(p));
|
||||
+ sourceDs->N[++sourceDs->i] = rpmteN(p);
|
||||
+ sourceDs->EVR[sourceDs->i] = evr++;
|
||||
+ sourceDs->Flags[sourceDs->i] = RPMSENSE_EQUAL;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ xx = rpmteClose(p, ts, 0);
|
||||
+ pi = rpmtsiFree(pi);
|
||||
+
|
||||
+ if (sourceDs->i == -1)
|
||||
+ return rc;
|
||||
+
|
||||
+ /* Fire elements against rpmdb trigger strings. */
|
||||
+ for(sourceDs->i = 0; sourceDs->i < (int)sourceDs->Count; sourceDs->i++) {
|
||||
+ const char * depName = sourceDs->N[sourceDs->i];
|
||||
+ unsigned prev, instance;
|
||||
+ unsigned nvals;
|
||||
+ ARGint_t vals;
|
||||
+
|
||||
+
|
||||
+ if (!depName || !*depName)
|
||||
+ return rc;
|
||||
+
|
||||
+ if (_psm_debug)
|
||||
+ rpmlog(RPMLOG_DEBUG, "--> %s:%d depName: %s tagno: %d ix: %d\n", __FUNCTION__, __LINE__, depName, tagno, sourceDs->i);
|
||||
+
|
||||
+ if (depName[0] == '/' && psm->Tmires != NULL) {
|
||||
+ miRE mire;
|
||||
+ int j;
|
||||
+
|
||||
+ /* XXX mireApply doesn't tell which pattern matched. */
|
||||
+ for (j = 0, mire = psm->Tmires; j < psm->nTmires; j++, mire++) {
|
||||
+ const char * pattern = psm->Tpats[j];
|
||||
+ size_t npattern = strlen(pattern);
|
||||
+ if (tagno == RPMTAG_DIRNAMES && !PATT_ISDIR(pattern, npattern))
|
||||
+ continue;
|
||||
+ if (mireRegexec(mire, depName, 0) < 0)
|
||||
+ /*@innercontinue@*/ continue;
|
||||
+
|
||||
+ /* Reset the primary retrieval key to the pattern. */
|
||||
+ depName = pattern;
|
||||
+ /*@innerbreak@*/ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Retrieve triggered header(s) by key. */
|
||||
+ mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, depName, 0);
|
||||
+ nvals = argiCount(instances);
|
||||
+ vals = argiData(instances);
|
||||
+ if (nvals > 0)
|
||||
+ xx = rpmmiPrune(mi, (uint32_t *)vals, nvals, 1);
|
||||
+
|
||||
+ prev = 0;
|
||||
+ while((triggeredH = rpmmiNext(mi)) != NULL) {
|
||||
+ instance = rpmmiInstance(mi);
|
||||
+ if (prev == instance)
|
||||
+ /*@innercontinue@*/ continue;
|
||||
+ rc |= handleOneScriptTrigger(psm, sourceDs, triggeredH, arg2);
|
||||
+ prev = instance;
|
||||
+ xx = argiAdd(&instances, -1, instance);
|
||||
+ xx = argiSort(instances, NULL);
|
||||
+ }
|
||||
+ mi = rpmmiFree(mi);
|
||||
+ }
|
||||
+
|
||||
+ instances = argiFree(instances);
|
||||
+
|
||||
+ return rc;
|
||||
+}
|
||||
+
|
||||
+/**
|
||||
+ * Run trigger scripts in the database that are fired by this header.
|
||||
+ * @param psm package state machine data
|
||||
+ * @return 0 on success
|
||||
+ */
|
||||
+static rpmRC runScriptTriggers(rpmpsm psm)
|
||||
+ /*@globals rpmGlobalMacroContext, h_errno,
|
||||
+ fileSystem, internalState @*/
|
||||
+ /*@modifies psm, rpmGlobalMacroContext,
|
||||
+ fileSystem, internalState @*/
|
||||
+{
|
||||
+ int numPackage = 0;
|
||||
+ int xx;
|
||||
+ rpmTag tagno;
|
||||
+ rpmRC rc = RPMRC_OK;
|
||||
+
|
||||
+ /* Select RPMTAG_NAME or RPMTAG_PROVIDENAME index for triggering. */
|
||||
+ if (_trigger_tag == 0) {
|
||||
+ const char * t = rpmExpand("%{?_trigger_tag}", NULL);
|
||||
+/*@-mods@*/
|
||||
+ _trigger_tag = (!strcmp(t, "name") ? RPMTAG_NAME : RPMTAG_PROVIDENAME);
|
||||
+/*@=mods@*/
|
||||
+ t = _free(t);
|
||||
+ }
|
||||
+ tagno = _trigger_tag;
|
||||
+
|
||||
+ /* XXX Save/restore count correction. */
|
||||
+ { int countCorrection = psm->countCorrection;
|
||||
+
|
||||
+ psm->countCorrection = 0;
|
||||
+
|
||||
+ /* Try name/providename triggers first. */
|
||||
+ rc |= runScriptTriggersLoop(psm, tagno, numPackage);
|
||||
+ /* If not limited to NEVRA triggers, also try file/dir path triggers. */
|
||||
+ if (tagno != RPMTAG_NAME) {
|
||||
+ /* Retrieve trigger patterns from rpmdb. */
|
||||
+ xx = rpmdbTriggerGlobs(psm);
|
||||
+
|
||||
+ rc |= runScriptTriggersLoop(psm, RPMTAG_BASENAMES, numPackage);
|
||||
+ rc |= runScriptTriggersLoop(psm, RPMTAG_DIRNAMES, numPackage);
|
||||
+
|
||||
+ psm->Tpats = argvFree(psm->Tpats);
|
||||
+ psm->Tmires = mireFreeAll(psm->Tmires, psm->nTmires);
|
||||
+ psm->nTmires = 0;
|
||||
+ }
|
||||
+
|
||||
+ psm->countCorrection = countCorrection;
|
||||
+ }
|
||||
+
|
||||
+ return rc;
|
||||
+}
|
||||
+
|
||||
/*@observer@*/
|
||||
static const char * pkgStageString(pkgStage a)
|
||||
/*@*/
|
||||
@@ -1776,6 +2121,8 @@ static const char * pkgStageString(pkgSt
|
||||
case PSM_CHROOT_IN: return "chrootin";
|
||||
case PSM_CHROOT_OUT: return "chrootout";
|
||||
case PSM_SCRIPT: return "script";
|
||||
+ case PSM_PRETRANS: return "pretrans";
|
||||
+ case PSM_POSTTRANS: return "posttrans";
|
||||
case PSM_TRIGGERS: return "triggers";
|
||||
case PSM_IMMED_TRIGGERS: return "immedtriggers";
|
||||
|
||||
@@ -1816,8 +2163,20 @@ assert(psm != NULL);
|
||||
case RPMTAG_VERIFYSCRIPT: psm->stepName = "verify"; break;
|
||||
case RPMTAG_PRETRANS: psm->stepName = "pretrans"; break;
|
||||
case RPMTAG_POSTTRANS: psm->stepName = "posttrans"; break;
|
||||
+ case RPMTAG_TRIGGERPRETRANSIN: psm->stepName = "triggerpretransin"; break;
|
||||
+ case RPMTAG_TRIGGERPRETRANSUN: psm->stepName = "triggerpretransun"; break;
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSIN: psm->stepName = "triggerposttransin"; break;
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSUN: psm->stepName = "triggerposttransun"; break;
|
||||
+ }
|
||||
+ switch (scriptTag) {
|
||||
+ default: psm->stage = PSM_SCRIPT; break;
|
||||
+ case RPMTAG_TRIGGERPRETRANSIN:
|
||||
+ case RPMTAG_TRIGGERPRETRANSUN: psm->stage = PSM_PRETRANS; break;
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSIN:
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSUN: psm->stage = PSM_POSTTRANS; break;
|
||||
}
|
||||
- return rpmpsmStage(psm, PSM_SCRIPT);
|
||||
+
|
||||
+ return rpmpsmStage(psm, psm->stage);
|
||||
}
|
||||
|
||||
/*@-mustmod@*/
|
||||
@@ -2254,7 +2613,7 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
|
||||
|
||||
/* XXX hackery to assert(!scareMem) in rpmfiNew. */
|
||||
/*@-castexpose@*/
|
||||
-if (fi->h == NULL && fi->te && ((rpmte)fi->te)->h != NULL) fi->h = headerLink(((rpmte)fi->te)->h);
|
||||
+if (fi != NULL && fi->h == NULL && fi->te && ((rpmte)fi->te)->h != NULL) fi->h = headerLink(((rpmte)fi->te)->h);
|
||||
/*@=castexpose@*/
|
||||
|
||||
switch (stage) {
|
||||
@@ -3041,6 +3400,34 @@ assert(psm->te != NULL);
|
||||
if (rc)
|
||||
xx = rpmtxnAbort(rpmtsGetRdb(ts)->db_txn);
|
||||
else
|
||||
+ xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
|
||||
+ rpmtsGetRdb(ts)->db_txn = NULL;
|
||||
+ } break;
|
||||
+ case PSM_PRETRANS:
|
||||
+ { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
|
||||
+ xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL);
|
||||
+ psm->scriptTag = RPMTAG_PRETRANS;
|
||||
+ psm->progTag = RPMTAG_PRETRANSPROG;
|
||||
+ psm->sense = psm->goal == PSM_PKGINSTALL ? (RPMSENSE_TRIGGERTRANS|RPMSENSE_TRIGGERPREIN) : (RPMSENSE_TRIGGERTRANS|RPMSENSE_TRIGGERUN);
|
||||
+ psm->countCorrection = 0;
|
||||
+ rc = runScriptTriggers(psm);
|
||||
+ if (rc)
|
||||
+ xx = rpmtxnAbort(rpmtsGetRdb(ts)->db_txn);
|
||||
+ else
|
||||
+ xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
|
||||
+ rpmtsGetRdb(ts)->db_txn = NULL;
|
||||
+ } break;
|
||||
+ case PSM_POSTTRANS:
|
||||
+ { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
|
||||
+ xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL);
|
||||
+ psm->scriptTag = RPMTAG_POSTTRANS;
|
||||
+ psm->progTag = RPMTAG_POSTTRANSPROG;
|
||||
+ psm->sense = psm->goal == PSM_PKGINSTALL ? (RPMSENSE_TRIGGERTRANS|RPMSENSE_TRIGGERIN) : (RPMSENSE_TRIGGERTRANS|RPMSENSE_TRIGGERPOSTUN);
|
||||
+ psm->countCorrection = 0;
|
||||
+ rc = runScriptTriggers(psm);
|
||||
+ if (rc)
|
||||
+ xx = rpmtxnAbort(rpmtsGetRdb(ts)->db_txn);
|
||||
+ else
|
||||
xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
|
||||
rpmtsGetRdb(ts)->db_txn = NULL;
|
||||
} break;
|
||||
--- rpm-5.4.15/lib/psm.h.trigtrans~ 2014-07-20 00:56:20.000000000 +0200
|
||||
+++ rpm-5.4.15/lib/psm.h 2014-09-05 06:44:52.724095787 +0200
|
||||
@@ -52,9 +52,11 @@ typedef enum pkgStage_e {
|
||||
PSM_CHROOT_IN = 51,
|
||||
PSM_CHROOT_OUT = 52,
|
||||
PSM_SCRIPT = 53,
|
||||
- PSM_TRIGGERS = 54,
|
||||
- PSM_IMMED_TRIGGERS = 55,
|
||||
- PSM_RPMIO_FLAGS = 56,
|
||||
+ PSM_PRETRANS = 54,
|
||||
+ PSM_POSTTRANS = 55,
|
||||
+ PSM_TRIGGERS = 56,
|
||||
+ PSM_IMMED_TRIGGERS = 57,
|
||||
+ PSM_RPMIO_FLAGS = 58,
|
||||
|
||||
PSM_RPMDB_LOAD = 97,
|
||||
PSM_RPMDB_ADD = 98,
|
||||
--- rpm-5.4.15/lib/transaction.c.trigtrans~ 2014-09-05 06:44:52.620761425 +0200
|
||||
+++ rpm-5.4.15/lib/transaction.c 2014-09-05 06:44:52.727429154 +0200
|
||||
@@ -1349,6 +1349,41 @@ assert(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * Run pre/post transaction script.
|
||||
+ * param ts transaction set
|
||||
+ * param stag RPMTAG_TRIGGERPRETRANS or RPMTAG_TRIGGERPOSTTRANS
|
||||
+ * return 0 on success
|
||||
+ */
|
||||
+static int rpmtsRunScriptTriggers(rpmts ts, rpmTag stag)
|
||||
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
|
||||
+ /*@modifies ts, rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
|
||||
+{
|
||||
+ rpmtsi pi;
|
||||
+ rpmte p;
|
||||
+ rpmfi fi;
|
||||
+ rpmpsm psm;
|
||||
+ int xx;
|
||||
+ rpmTag ptag;
|
||||
+
|
||||
+FPSDEBUG(0, (stderr, "--> %s(%p,%s(%u))\n", __FUNCTION__, ts, tagName(stag), (unsigned)stag));
|
||||
+ switch (stag) {
|
||||
+ default:
|
||||
+assert(0);
|
||||
+ /*@notreached@*/ break;
|
||||
+ case RPMTAG_TRIGGERPRETRANSIN:
|
||||
+ case RPMTAG_TRIGGERPRETRANSUN: ptag = RPMTAG_PRETRANSPROG; break;
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSIN:
|
||||
+ case RPMTAG_TRIGGERPOSTTRANSUN: ptag = RPMTAG_POSTTRANSPROG; break;
|
||||
+ }
|
||||
+
|
||||
+ psm = rpmpsmNew(ts, NULL, NULL);
|
||||
+ psm->goal = (stag == RPMTAG_TRIGGERPRETRANSIN || stag == RPMTAG_TRIGGERPOSTTRANSIN) ? PSM_PKGINSTALL : PSM_PKGERASE;
|
||||
+ xx = rpmpsmScriptStage(psm, stag, ptag);
|
||||
+ psm = rpmpsmFree(psm, __FUNCTION__);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
/* Add fingerprint for each file not skipped. */
|
||||
static void rpmtsAddFingerprints(rpmts ts, uint32_t fileCount, hashTable ht,
|
||||
fingerPrintCache fpc)
|
||||
@@ -2264,6 +2299,13 @@ fprintf(stderr, "--> %s(%p,%p,0x%x) tsfl
|
||||
{
|
||||
rpmlog(RPMLOG_DEBUG, D_("running pre-transaction scripts\n"));
|
||||
xx = rpmtsRunScript(ts, RPMTAG_PRETRANS);
|
||||
+
|
||||
+ /* Run *after* pre-transaction scripts so that they may perform
|
||||
+ * any changes affecting pre-transaction triggers first if necessary.
|
||||
+ */
|
||||
+ rpmlog(RPMLOG_DEBUG, D_("running pre-transaction triggers\n"));
|
||||
+ xx = rpmtsRunScriptTriggers(ts, RPMTAG_TRIGGERPRETRANSIN);
|
||||
+ xx = rpmtsRunScriptTriggers(ts, RPMTAG_TRIGGERPRETRANSUN);
|
||||
}
|
||||
|
||||
/* ===============================================
|
||||
@@ -2321,6 +2363,10 @@ fprintf(stderr, "--> %s(%p,%p,0x%x) tsfl
|
||||
|
||||
rpmlog(RPMLOG_DEBUG, D_("running post-transaction scripts\n"));
|
||||
xx = rpmtsRunScript(ts, RPMTAG_POSTTRANS);
|
||||
+
|
||||
+ rpmlog(RPMLOG_DEBUG, D_("running post-transaction triggers\n"));
|
||||
+ xx = rpmtsRunScriptTriggers(ts, RPMTAG_TRIGGERPOSTTRANSIN);
|
||||
+ xx = rpmtsRunScriptTriggers(ts, RPMTAG_TRIGGERPOSTTRANSUN);
|
||||
}
|
||||
|
||||
exit:
|
||||
--- rpm-5.4.15/rpmconstant/rpmconstanttbl.c.trigtrans~ 2014-08-17 14:28:12.000000000 +0200
|
||||
+++ rpm-5.4.15/rpmconstant/rpmconstanttbl.c 2014-09-05 06:44:52.727429154 +0200
|
||||
@@ -670,6 +670,8 @@ static const struct rpmconstant_s rpmPar
|
||||
{ "PART_BUILDARCHITECTURES", PART_BUILDARCHITECTURES }, /*!< */
|
||||
{ "PART_TRIGGERPOSTUN", PART_TRIGGERPOSTUN }, /*!< */
|
||||
{ "PART_TRIGGERPREIN", PART_TRIGGERPREIN }, /*!< */
|
||||
+ { "PART_TRIGGERPOSTTRANSIN", PART_TRIGGERPOSTTRANSIN }, /*!< */
|
||||
+ { "PART_TRIGGERPOSTTRANSUN", PART_TRIGGERPOSTTRANSUN }, /*!< */
|
||||
{ "PART_SANITYCHECK", PART_SANITYCHECK }, /*!< */
|
||||
{ "PART_ARBITRARY", PART_ARBITRARY }, /*!< */
|
||||
{ "PART_LAST", PART_LAST }, /*!< */
|
||||
@@ -686,7 +688,7 @@ const struct rpmconstant_s * rpmParseSta
|
||||
static const struct rpmconstant_s rpmsenseflagsctbl[] = {
|
||||
#ifdef H_RPMEVR
|
||||
{ "RPMSENSE_ANY", RPMSENSE_ANY },
|
||||
- { "RPMSENSE_SERIAL", RPMSENSE_SERIAL },
|
||||
+ { "RPMSENSE_TRIGGERTRANS", RPMSENSE_TRIGGERTRANS },
|
||||
{ "RPMSENSE_LESS", RPMSENSE_LESS },
|
||||
{ "RPMSENSE_GREATER", RPMSENSE_GREATER },
|
||||
{ "RPMSENSE_EQUAL", RPMSENSE_EQUAL },
|
||||
@@ -1093,6 +1095,10 @@ static const struct rpmconstant_s rpmTag
|
||||
{ "RPMTAG_OBSOLETEYAMLENTRY", RPMTAG_OBSOLETEYAMLENTRY }, /* s[] */
|
||||
{ "RPMTAG_PROVIDEYAMLENTRY", RPMTAG_PROVIDEYAMLENTRY }, /* s[] */
|
||||
{ "RPMTAG_REQUIREYAMLENTRY", RPMTAG_REQUIREYAMLENTRY }, /* s[] */
|
||||
+ { "RPMTAG_TRIGGERPRETRANSIN", RPMTAG_TRIGGERPRETRANSIN }, /* internal */
|
||||
+ { "RPMTAG_TRIGGERPRETRANSUN", RPMTAG_TRIGGERPRETRANSUN }, /* internal */
|
||||
+ { "RPMTAG_TRIGGERPOSTTRANSIN", RPMTAG_TRIGGERPOSTTRANSIN }, /* internal */
|
||||
+ { "RPMTAG_TRIGGERPOSTTRANSUN", RPMTAG_TRIGGERPOSTTRANSUN }, /* internal */
|
||||
{ "RPMTAG_FILEDIGESTALGO", RPMTAG_FILEDIGESTALGO }, /* i file checksum algorithm */
|
||||
{ "RPMTAG_BUGURL", RPMTAG_BUGURL }, /* s */
|
||||
{ "RPMTAG_FIRSTFREE_TAG", RPMTAG_FIRSTFREE_TAG }, /*!< internal */
|
||||
@@ -1173,6 +1179,10 @@ static const struct rpmconstant_s rpmScr
|
||||
{ "RPMSCRIPT_PREUN", RPMSCRIPT_PREUN }, /*!< %preun scriptlet */
|
||||
{ "RPMSCRIPT_POSTUN", RPMSCRIPT_POSTUN }, /*!< %postun scriptlet */
|
||||
{ "RPMSCRIPT_POSTTRANS", RPMSCRIPT_POSTTRANS }, /*!< %posttrans scriptlet */
|
||||
+ { "RPMSCRIPT_TRIGGERPRETRANSIN", RPMSCRIPT_TRIGGERPRETRANSIN }, /*!< %triggerpretransin scriptlet */
|
||||
+ { "RPMSCRIPT_TRIGGERPRETRANSUN", RPMSCRIPT_TRIGGERPRETRANSUN }, /*!< %triggerpretransun scriptlet */
|
||||
+ { "RPMSCRIPT_TRIGGERPOSTTRANSIN", RPMSCRIPT_TRIGGERPOSTTRANSIN }, /*!< %triggerposttransin scriptlet */
|
||||
+ { "RPMSCRIPT_TRIGGERPOSTTRANSUN", RPMSCRIPT_TRIGGERPOSTTRANSUN }, /*!< %triggerposttransun scriptlet */
|
||||
{ "RPMSCRIPT_VERIFY", RPMSCRIPT_VERIFY }, /*!< %verify scriptlet */
|
||||
{ "RPMSCRIPT_PREP", RPMSCRIPT_PREP }, /*!< %prep build scriptlet */
|
||||
{ "RPMSCRIPT_BUILD", RPMSCRIPT_BUILD }, /*!< %build build scriptlet */
|
||||
--- rpm-5.4.15/rpmdb/hdrfmt.c.trigtrans~ 2014-09-05 06:44:52.690762122 +0200
|
||||
+++ rpm-5.4.15/rpmdb/hdrfmt.c 2014-09-05 06:44:52.727429154 +0200
|
||||
@@ -663,16 +663,29 @@ assert(ix == 0);
|
||||
val = xstrdup(_("(invalid type)"));
|
||||
else {
|
||||
rpmuint64_t anint = he->p.ui64p[ix];
|
||||
- if (anint & RPMSENSE_TRIGGERPREIN)
|
||||
- val = xstrdup("prein");
|
||||
- else if (anint & RPMSENSE_TRIGGERIN)
|
||||
- val = xstrdup("in");
|
||||
- else if (anint & RPMSENSE_TRIGGERUN)
|
||||
- val = xstrdup("un");
|
||||
- else if (anint & RPMSENSE_TRIGGERPOSTUN)
|
||||
- val = xstrdup("postun");
|
||||
- else
|
||||
- val = xstrdup("");
|
||||
+ if (anint & RPMSENSE_TRIGGERTRANS) {
|
||||
+ if (anint & RPMSENSE_TRIGGERPREIN)
|
||||
+ val = xstrdup("pretransin");
|
||||
+ else if (anint & RPMSENSE_TRIGGERIN)
|
||||
+ val = xstrdup("posttransin");
|
||||
+ else if (anint & RPMSENSE_TRIGGERUN)
|
||||
+ val = xstrdup("pretransun");
|
||||
+ else if (anint & RPMSENSE_TRIGGERPOSTUN)
|
||||
+ val = xstrdup("posttransun");
|
||||
+ else /* shouldn't be reached... */
|
||||
+ val = xstrdup("");
|
||||
+ } else {
|
||||
+ if (anint & RPMSENSE_TRIGGERPREIN)
|
||||
+ val = xstrdup("prein");
|
||||
+ else if (anint & RPMSENSE_TRIGGERIN)
|
||||
+ val = xstrdup("in");
|
||||
+ else if (anint & RPMSENSE_TRIGGERUN)
|
||||
+ val = xstrdup("un");
|
||||
+ else if (anint & RPMSENSE_TRIGGERPOSTUN)
|
||||
+ val = xstrdup("postun");
|
||||
+ else
|
||||
+ val = xstrdup("");
|
||||
+ }
|
||||
}
|
||||
return val;
|
||||
}
|
||||
@@ -2101,16 +2114,29 @@ static int triggertypeTag(Header h, HE_t
|
||||
}
|
||||
|
||||
/* XXX FIXME: there's memory leaks here. */
|
||||
- if (flags.ui32p[j] & RPMSENSE_TRIGGERPREIN)
|
||||
- he->p.argv[i] = xstrdup("prein");
|
||||
- else if (flags.ui32p[j] & RPMSENSE_TRIGGERIN)
|
||||
- he->p.argv[i] = xstrdup("in");
|
||||
- else if (flags.ui32p[j] & RPMSENSE_TRIGGERUN)
|
||||
- he->p.argv[i] = xstrdup("un");
|
||||
- else if (flags.ui32p[j] & RPMSENSE_TRIGGERPOSTUN)
|
||||
- he->p.argv[i] = xstrdup("postun");
|
||||
- else
|
||||
- he->p.argv[i] = xstrdup("");
|
||||
+ if (flags.ui32p[j] & RPMSENSE_TRIGGERTRANS) {
|
||||
+ if (flags.ui32p[j] & RPMSENSE_TRIGGERPREIN)
|
||||
+ he->p.argv[i] = xstrdup("pretransin");
|
||||
+ else if (flags.ui32p[j] & RPMSENSE_TRIGGERIN)
|
||||
+ he->p.argv[i] = xstrdup("posttransin");
|
||||
+ else if (flags.ui32p[j] & RPMSENSE_TRIGGERUN)
|
||||
+ he->p.argv[i] = xstrdup("pretransun");
|
||||
+ else if (flags.ui32p[j] & RPMSENSE_TRIGGERPOSTUN)
|
||||
+ he->p.argv[i] = xstrdup("posttransun");
|
||||
+ else /* shouldn't be reached... */
|
||||
+ he->p.argv[i] = xstrdup("");
|
||||
+ } else {
|
||||
+ if (flags.ui32p[j] & RPMSENSE_TRIGGERPREIN)
|
||||
+ he->p.argv[i] = xstrdup("prein");
|
||||
+ else if (flags.ui32p[j] & RPMSENSE_TRIGGERIN)
|
||||
+ he->p.argv[i] = xstrdup("in");
|
||||
+ else if (flags.ui32p[j] & RPMSENSE_TRIGGERUN)
|
||||
+ he->p.argv[i] = xstrdup("un");
|
||||
+ else if (flags.ui32p[j] & RPMSENSE_TRIGGERPOSTUN)
|
||||
+ he->p.argv[i] = xstrdup("postun");
|
||||
+ else
|
||||
+ he->p.argv[i] = xstrdup("");
|
||||
+ }
|
||||
/*@innerbreak@*/ break;
|
||||
}
|
||||
}
|
||||
--- rpm-5.4.15/rpmdb/rpmevr.h.trigtrans~ 2014-07-20 01:15:45.000000000 +0200
|
||||
+++ rpm-5.4.15/rpmdb/rpmevr.h 2014-09-05 06:44:52.727429154 +0200
|
||||
@@ -27,7 +27,7 @@ typedef enum evrFlags_e {
|
||||
#if defined(_RPMEVR_INTERNAL)
|
||||
RPMSENSE_ANY = 0,
|
||||
/*@-enummemuse@*/
|
||||
- RPMSENSE_SERIAL = (1 << 0), /*!< (obsolete). */
|
||||
+ RPMSENSE_TRIGGERTRANS = (1 << 0), /*!< modifies %triggerfoo to %triggerfootrans. */
|
||||
/*@=enummemuse@*/
|
||||
#endif
|
||||
RPMSENSE_LESS = (1 << 1),
|
||||
@@ -96,7 +96,7 @@ struct EVR_s {
|
||||
};
|
||||
|
||||
#define RPMSENSE_TRIGGER \
|
||||
- (RPMSENSE_TRIGGERPREIN | RPMSENSE_TRIGGERIN | RPMSENSE_TRIGGERUN | RPMSENSE_TRIGGERPOSTUN)
|
||||
+ (RPMSENSE_TRIGGERPREIN | RPMSENSE_TRIGGERIN | RPMSENSE_TRIGGERUN | RPMSENSE_TRIGGERPOSTUN | RPMSENSE_TRIGGERTRANS)
|
||||
|
||||
#define _ALL_REQUIRES_MASK (\
|
||||
RPMSENSE_INTERP | \
|
||||
--- rpm-5.4.15/rpmdb/rpmtag.h.trigtrans~ 2014-07-20 00:01:02.000000000 +0200
|
||||
+++ rpm-5.4.15/rpmdb/rpmtag.h 2014-09-05 06:44:52.727429154 +0200
|
||||
@@ -416,6 +416,10 @@ enum rpmTag_e {
|
||||
RPMTAG_OBSOLETEYAMLENTRY = 1220, /* s[] */
|
||||
RPMTAG_PROVIDEYAMLENTRY = 1221, /* s[] */
|
||||
RPMTAG_REQUIREYAMLENTRY = 1222, /* s[] */
|
||||
+ RPMTAG_TRIGGERPRETRANSIN = 1223, /* internal */
|
||||
+ RPMTAG_TRIGGERPRETRANSUN = 1224, /* internal */
|
||||
+ RPMTAG_TRIGGERPOSTTRANSIN = 1225, /* internal */
|
||||
+ RPMTAG_TRIGGERPOSTTRANSUN = 1226, /* internal */
|
||||
|
||||
RPMTAG_FILEDIGESTALGO = 5011, /* i file checksum algorithm */
|
||||
RPMTAG_BUGURL = 5012, /* s */
|
||||
--- rpm-5.4.15/rpmdb/rpmtypes.h.trigtrans~ 2011-05-03 17:58:19.000000000 +0200
|
||||
+++ rpm-5.4.15/rpmdb/rpmtypes.h 2014-09-05 06:44:52.727429154 +0200
|
||||
@@ -70,7 +70,11 @@ typedef enum rpmScriptID_e {
|
||||
RPMSCRIPT_POSTUN = 7, /*!< %postun scriptlet */
|
||||
RPMSCRIPT_TRIGGERPOSTUN = 8, /*!< %triggerpostun scriptlet */
|
||||
RPMSCRIPT_POSTTRANS = 9, /*!< %posttrans scriptlet */
|
||||
- /* 10-15 unused */
|
||||
+ RPMSCRIPT_TRIGGERPRETRANSIN = 10, /*!< %triggerpretrans scriptlet */
|
||||
+ RPMSCRIPT_TRIGGERPRETRANSUN = 11, /*!< %triggerpretrans scriptlet */
|
||||
+ RPMSCRIPT_TRIGGERPOSTTRANSIN= 12, /*!< %triggerposttrans scriptlet */
|
||||
+ RPMSCRIPT_TRIGGERPOSTTRANSUN= 13, /*!< %triggerposttrans scriptlet */
|
||||
+ /* 14-15 unused */
|
||||
RPMSCRIPT_VERIFY = 16, /*!< %verify scriptlet */
|
||||
RPMSCRIPT_SANITYCHECK = 17, /*!< %sanitycheck scriptlet */
|
||||
/* 18-23 unused */
|
||||
Loading…
Add table
Reference in a new issue