Attachment 146235 Details for Bug 127359 – patch that introduces new arch-specific pre, post and trigger arguments

[patch] patch that introduces new arch-specific pre, post and trigger arguments

rpm-arch-args-4.patch (text/plain), 11.38 KB, created by Thomas Fitzsimmons on 2007-01-22 21:50:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Fitzsimmons

Created: 2007-01-22 21:50:19 UTC

Size: 11.38 KB

patch

obsolete

>diff -x autom4te -x Makefile.in -ur ../rpm-4.4.2.orig/lib/psm.c ./lib/psm.c
>--- ../rpm-4.4.2.orig/lib/psm.c	2005-07-13 07:13:34.000000000 -0400
>+++ ./lib/psm.c	2007-01-15 17:35:28.000000000 -0500
>@@ -495,7 +495,8 @@
>  */
> static rpmRC runLuaScript(rpmpsm psm, Header h, const char *sln,
> 		   int progArgc, const char **progArgv,
>-		   const char *script, int arg1, int arg2)
>+                          const char *script, int arg1, int arg2,
>+                          int arg3, int arg4)
> 	/*@globals fileSystem, internalState @*/
> 	/*@modifies psm, fileSystem, internalState @*/
> {
>@@ -544,6 +545,14 @@
> 	rpmluavSetValueNum(var, arg2);
> 	rpmluaSetVar(lua, var);
>     }
>+    if (arg3 >= 0) {
>+	rpmluavSetValueNum(var, arg3);
>+	rpmluaSetVar(lua, var);
>+    }
>+    if (arg4 >= 0) {
>+	rpmluavSetValueNum(var, arg4);
>+	rpmluaSetVar(lua, var);
>+    }
> /*@=relaxtypes@*/
> /*@-moduncon@*/
>     var = rpmluavFree(var);
>@@ -601,7 +610,8 @@
>  */
> static rpmRC runScript(rpmpsm psm, Header h, const char * sln,
> 		int progArgc, const char ** progArgv,
>-		const char * script, int arg1, int arg2)
>+                       const char * script, int arg1, int arg2,
>+                       int arg3, int arg4)
> 	/*@globals ldconfig_done, rpmGlobalMacroContext, h_errno,
> 		fileSystem, internalState@*/
> 	/*@modifies psm, ldconfig_done, rpmGlobalMacroContext,
>@@ -641,7 +651,7 @@
> 		_("%s: %s(%s-%s-%s.%s) running <lua> scriptlet.\n"),
> 		psm->stepName, tag2sln(psm->scriptTag), n, v, r, a);
> 	return runLuaScript(psm, h, sln, progArgc, progArgv,
>-			    script, arg1, arg2);
>+			    script, arg1, arg2, arg3, arg4);
>     }
> 
>     psm->sq.reaper = 1;
>@@ -774,6 +784,16 @@
> 	    sprintf(av, "%d", arg2);
> 	    argv[argc++] = av;
> 	}
>+	if (arg3 >= 0) {
>+	    char *av = alloca(20);
>+	    sprintf(av, "%d", arg3);
>+	    argv[argc++] = av;
>+	}
>+	if (arg4 >= 0) {
>+	    char *av = alloca(20);
>+	    sprintf(av, "%d", arg4);
>+	    argv[argc++] = av;
>+	}
>     }
> 
>     argv[argc] = NULL;
>@@ -989,7 +1009,7 @@
> 
>     if (fi->h != NULL)	/* XXX can't happen */
>     rc = runScript(psm, fi->h, tag2sln(psm->scriptTag), progArgc, argv,
>-		script, psm->scriptArg, -1);
>+                   script, psm->scriptArg, psm->scriptArgArch, -1, -1);
> 
> exit:
>     progArgv = hfd(progArgv, ptt);
>@@ -1009,7 +1029,7 @@
>  */
> static rpmRC handleOneTrigger(const rpmpsm psm,
> 			Header sourceH, Header triggeredH,
>-			int arg2, unsigned char * triggersAlreadyRun)
>+                              int arg2, int arg4, unsigned char * triggersAlreadyRun)
> 	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState@*/
> 	/*@modifies psm, sourceH, triggeredH, *triggersAlreadyRun,
> 		rpmGlobalMacroContext, fileSystem, internalState @*/
>@@ -1025,12 +1045,14 @@
>     int_32 * triggerIndices;
>     const char * sourceName;
>     const char * triggerName;
>+    const char * triggerArch;
>     rpmRC rc = RPMRC_OK;
>     int xx;
>     int i;
> 
>     xx = headerNVR(sourceH, &sourceName, NULL, NULL);
>     xx = headerNVR(triggeredH, &triggerName, NULL, NULL);
>+    xx = headerNEVRA(triggeredH, NULL, NULL, NULL, NULL, &triggerArch);
> 
>     trigger = rpmdsInit(rpmdsNew(triggeredH, RPMTAG_TRIGGERNAME, scareMem));
>     if (trigger == NULL)
>@@ -1067,21 +1089,24 @@
> 	    continue;
> 
> 	{   int arg1;
>+            int arg3;
> 	    int index;
> 
> 	    arg1 = rpmdbCountPackages(rpmtsGetRdb(ts), triggerName);
>+	    arg3 = rpmdbCountPackagesArch(rpmtsGetRdb(ts), triggerName, triggerArch);
> 	    if (arg1 < 0) {
> 		/* XXX W2DO? fails as "execution of script failed" */
> 		rc = RPMRC_FAIL;
> 	    } else {
> 		arg1 += psm->countCorrection;
>+		arg3 += psm->countCorrection;
> 		index = triggerIndices[i];
> 		if (triggersAlreadyRun == NULL ||
> 		    triggersAlreadyRun[index] == 0)
> 		{
> 		    rc = runScript(psm, triggeredH, "%trigger", 1,
> 			    triggerProgs + index, triggerScripts[index],
>-			    arg1, arg2);
>+                                   arg1, arg2, arg3, arg4);
> 		    if (triggersAlreadyRun != NULL)
> 			triggersAlreadyRun[index] = 1;
> 		}
>@@ -1118,15 +1143,22 @@
>     const rpmts ts = psm->ts;
>     rpmfi fi = psm->fi;
>     int numPackage = -1;
>+    int numPackageArch = -1;
>     rpmRC rc = RPMRC_OK;
>     const char * N = NULL;
>+    const char * A = NULL;
>+    const char * triggerArch = NULL;
> 
>     if (psm->te) 	/* XXX can't happen */
>+      {
> 	N = rpmteN(psm->te);
>+        A = rpmteA(psm->te);
>+      }
> /* XXX: Might need to adjust instance counts four autorollback. */
>     if (N) 		/* XXX can't happen */
> 	numPackage = rpmdbCountPackages(rpmtsGetRdb(ts), N)
> 				+ psm->countCorrection;
>+
>     if (numPackage < 0)
> 	return RPMRC_NOTFOUND;
> 
>@@ -1138,7 +1170,22 @@
> 	psm->countCorrection = 0;
> 	mi = rpmtsInitIterator(ts, RPMTAG_TRIGGERNAME, N, 0);
> 	while((triggeredH = rpmdbNextIterator(mi)) != NULL)
>-	    rc |= handleOneTrigger(psm, fi->h, triggeredH, numPackage, NULL);
>+          {
>+            int xx = headerNEVRA(triggeredH, NULL, NULL, NULL, NULL, &triggerArch);
>+            numPackageArch = rpmdbCountPackagesArch(rpmtsGetRdb(ts), N, triggerArch);
>+            /* Adjust trigger package count if source arch = trigger arch. */
>+            if (!strcmp(A, triggerArch))
>+              numPackageArch += countCorrection;
>+
>+            if (numPackageArch < 0)
>+              {
>+                mi = rpmdbFreeIterator(mi);
>+                psm->countCorrection = countCorrection;
>+                return RPMRC_NOTFOUND;
>+              }
>+
>+            rc |= handleOneTrigger(psm, fi->h, triggeredH, numPackage, numPackageArch, NULL);
>+          }
> 	mi = rpmdbFreeIterator(mi);
> 	psm->countCorrection = countCorrection;
>     }
>@@ -1168,6 +1215,7 @@
>     int numTriggerIndices;
>     unsigned char * triggersRun;
>     rpmRC rc = RPMRC_OK;
>+    int xx;
> 
>     if (fi->h == NULL)	return rc;	/* XXX can't happen */
> 
>@@ -1190,10 +1238,12 @@
> 	    if (triggersRun[triggerIndices[i]] != 0) continue;
> 	
> 	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, triggerNames[i], 0);
>-
> 	    while((sourceH = rpmdbNextIterator(mi)) != NULL) {
> 		rc |= handleOneTrigger(psm, sourceH, fi->h,
> 				rpmdbGetIteratorCount(mi),
>+                                rpmdbCountPackagesArch(rpmtsGetRdb(ts),
>+                                                       triggerNames[i],
>+                                                       rpmteA(psm->te)),
> 				triggersRun);
> 	    }
> 
>@@ -1376,6 +1426,14 @@
> 	    break;
> 	}
> 
>+	psm->npkgs_installed_arch = rpmdbCountPackagesArch(rpmtsGetRdb(ts),
>+                                                           rpmteN(psm->te),
>+                                                           rpmteA(psm->te));
>+	if (psm->npkgs_installed_arch < 0) {
>+	    rc = RPMRC_FAIL;
>+	    break;
>+	}
>+
> 	/* If we have a score then autorollback is enabled.  If autorollback is
>  	 * enabled, and this is an autorollback transaction, then we may need to
> 	 * adjust the pkgs installed count.
>@@ -1414,7 +1472,10 @@
> 		if (se && se->installed &&
> 	 	    !se->erased &&
> 		    (se->te_types & (TR_ADDED|TR_REMOVED)))
>+                  {
> 		    psm->npkgs_installed--;
>+		    psm->npkgs_installed_arch--;
>+                  }
> 	   }
> 	}
> 
>@@ -1422,6 +1483,7 @@
> 	    int fc = rpmfiFC(fi);
> 
> 	    psm->scriptArg = psm->npkgs_installed + 1;
>+	    psm->scriptArgArch = psm->npkgs_installed_arch + 1;
> 
> assert(psm->mi == NULL);
> 	    psm->mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(psm->te), 0);
>@@ -1482,6 +1544,7 @@
> 	}
> 	if (psm->goal == PSM_PKGERASE || psm->goal == PSM_PKGSAVE) {
> 	    psm->scriptArg = psm->npkgs_installed - 1;
>+	    psm->scriptArgArch = psm->npkgs_installed_arch - 1;
> 	
> 	    /* Retrieve installed header. */
> 	    rc = rpmpsmNext(psm, PSM_RPMDB_LOAD);
>diff -x autom4te -x Makefile.in -ur ../rpm-4.4.2.orig/lib/psm.h ./lib/psm.h
>--- ../rpm-4.4.2.orig/lib/psm.h	2003-05-08 16:39:30.000000000 -0400
>+++ ./lib/psm.h	2007-01-15 17:26:01.000000000 -0500
>@@ -106,6 +106,10 @@
> 
> /*@refs@*/
>     int nrefs;			/*!< Reference count. */
>+
>+/*@dependent@*/
>+    int npkgs_installed_arch;	/*!< No. of installed instances for this arch. */
>+    int scriptArgArch;		/*!< Arch-specific Scriptlet package arg. */
> };
> 
> #ifdef __cplusplus
>diff -x autom4te -x Makefile.in -ur ../rpm-4.4.2.orig/rpmdb/rpmdb.c ./rpmdb/rpmdb.c
>--- ../rpm-4.4.2.orig/rpmdb/rpmdb.c	2005-02-15 22:18:19.000000000 -0500
>+++ ./rpmdb/rpmdb.c	2007-01-15 17:26:01.000000000 -0500
>@@ -1389,6 +1389,103 @@
>     return rc;
> }
> 
>+int rpmdbCountPackagesArch(rpmdb db, const char * name, const char * arch)
>+{
>+DBC * dbcursor = NULL;
>+DBT * key = alloca(sizeof(*key));
>+DBT * data = alloca(sizeof(*data));
>+    dbiIndex dbi;
>+    int rc;
>+    int xx;
>+    int i;
>+    int gotMatches = 0;
>+
>+    if (db == NULL)
>+	return 0;
>+
>+memset(key, 0, sizeof(*key));
>+memset(data, 0, sizeof(*data));
>+
>+    dbi = dbiOpen(db, RPMTAG_NAME, 0);
>+    if (dbi == NULL)
>+	return 0;
>+
>+/*@-temptrans@*/
>+key->data = (void *) name;
>+/*@=temptrans@*/
>+key->size = strlen(name);
>+
>+    xx = dbiCopen(dbi, dbi->dbi_txnid, &dbcursor, 0);
>+    rc = dbiGet(dbi, dbcursor, key, data, DB_SET);
>+#ifndef	SQLITE_HACK
>+    xx = dbiCclose(dbi, dbcursor, 0);
>+    dbcursor = NULL;
>+#endif
>+
>+    if (rc == 0) {		/* success */
>+	dbiIndexSet matches;
>+	/*@-nullpass@*/ /* FIX: matches might be NULL */
>+	matches = NULL;
>+	(void) dbt2set(dbi, data, &matches);
>+	if (matches) {
>+          /* Make sure the arch matches. */
>+          /*@-branchstate@*/
>+          for (i = 0; i < dbiIndexSetCount(matches); i++) {
>+            unsigned int recoff = dbiIndexRecordOffset(matches, i);
>+            rpmdbMatchIterator mi;
>+            Header h;
>+
>+            if (recoff == 0)
>+              continue;
>+
>+            mi = rpmdbInitIterator(dbi->dbi_rpmdb,
>+                                   RPMDBI_PACKAGES, &recoff, sizeof(recoff));
>+
>+            /* Set iterator selectors for arch if available. */
>+            if (arch &&
>+                rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP, arch))
>+              {
>+                rc = RPMRC_FAIL;
>+                if (mi)
>+                  mi = rpmdbFreeIterator(mi);
>+                matches = dbiFreeIndexSet(matches);
>+                goto exit;
>+              }
>+
>+            h = rpmdbNextIterator(mi);
>+            /*@-boundswrite@*/
>+            if (h)
>+              matches->recs[gotMatches++] = matches->recs[i];
>+            else
>+              matches->recs[i].hdrNum = 0;
>+            /*@=boundswrite@*/
>+            mi = rpmdbFreeIterator(mi);
>+          }
>+          /*@=branchstate@*/
>+
>+          rc = gotMatches;
>+          matches = dbiFreeIndexSet(matches);
>+	}
>+	/*@=nullpass@*/
>+    } else
>+    if (rc == DB_NOTFOUND) {	/* not found */
>+	rc = 0;
>+    } else {			/* error */
>+	rpmError(RPMERR_DBGETINDEX,
>+		_("error(%d) getting \"%s\" records from %s index\n"),
>+		rc, key->data, tagName(dbi->dbi_rpmtag));
>+	rc = -1;
>+    }
>+
>+ exit:
>+#ifdef	SQLITE_HACK
>+    xx = dbiCclose(dbi, dbcursor, 0);
>+    dbcursor = NULL;
>+#endif
>+
>+    return rc;
>+}
>+
> /**
>  * Attempt partial matches on name[-version[-release]] strings.
>  * @param dbi		index database handle (always RPMTAG_NAME)
>diff -x autom4te -x Makefile.in -ur ../rpm-4.4.2.orig/rpmdb/rpmdb.h ./rpmdb/rpmdb.h
>--- ../rpm-4.4.2.orig/rpmdb/rpmdb.h	2005-03-23 13:16:17.000000000 -0500
>+++ ./rpmdb/rpmdb.h	2007-01-15 17:26:01.000000000 -0500
>@@ -931,6 +931,8 @@
> 	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
> 	/*@modifies db, rpmGlobalMacroContext, fileSystem, internalState @*/;
> 
>+int rpmdbCountPackagesArch(rpmdb db, const char * name, const char * arch);
>+
> /** \ingroup rpmdb
>  * Return header join key for current position of rpm database iterator.
>  * @param mi		rpm database iterator

Actions: View | Diff

Attachments on bug 127359: 146235 | 146251 | 146252