RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 30-May-2009 20:58:48
Branch: HEAD Handle: 2009053018584800
Modified files:
rpm/lib poptI.c psm.c psm.h
Log:
- jbj: commit to Yet Another name <-> number mapping for package
scriptlets.
Summary:
Revision Changes Path
2.55 +3 -3 rpm/lib/poptI.c
2.370 +10 -2 rpm/lib/psm.c
2.75 +21 -16 rpm/lib/psm.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/lib/poptI.c
============================================================================
$ cvs diff -u -r2.54 -r2.55 poptI.c
--- rpm/lib/poptI.c 11 Apr 2009 14:47:13 -0000 2.54
+++ rpm/lib/poptI.c 30 May 2009 18:58:48 -0000 2.55
@@ -344,11 +344,11 @@
NULL},
{ "nodigest", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NODIGEST,
- N_("don't verify package digest(s)"), NULL },
+ N_("don't verify package digest(s)"), NULL },
{ "nohdrchk", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NOHDRCHK,
- N_("don't verify database header(s) when retrieved"), NULL },
+ N_("don't verify database header(s) when retrieved"), NULL },
{ "nosignature", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL,
RPMCLI_POPT_NOSIGNATURE,
- N_("don't verify package signature(s)"), NULL },
+ N_("don't verify package signature(s)"), NULL },
{ "oldpackage", '\0', POPT_BIT_SET,
&rpmIArgs.probFilter, RPMPROB_FILTER_OLDPACKAGE,
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.369 -r2.370 psm.c
--- rpm/lib/psm.c 15 May 2009 13:40:58 -0000 2.369
+++ rpm/lib/psm.c 30 May 2009 18:58:48 -0000 2.370
@@ -434,6 +434,10 @@
case RPMTAG_TRIGGERPOSTUN: return "%triggerpostun";
case RPMTAG_VERIFYSCRIPT: return "%verify";
case RPMTAG_SANITYCHECK: return "%sanitycheck";
+ case RPMTAG_BUILDPREP: return "%prep";
+ case RPMTAG_BUILDBUILD: return "%build";
+ case RPMTAG_BUILDINSTALL: return "%install";
+ case RPMTAG_BUILDCHECK: return "%check";
default: break;
}
return "%unknownscript";
@@ -460,9 +464,13 @@
case RPMTAG_TRIGGERPOSTUN: return RPMSCRIPT_TRIGGERPOSTUN;
case RPMTAG_VERIFYSCRIPT: return RPMSCRIPT_VERIFY;
case RPMTAG_SANITYCHECK: return RPMSCRIPT_SANITYCHECK;
+ case RPMTAG_BUILDPREP: return RPMSCRIPT_PREP;
+ case RPMTAG_BUILDBUILD: return RPMSCRIPT_BUILD;
+ case RPMTAG_BUILDINSTALL: return RPMSCRIPT_INSTALL;
+ case RPMTAG_BUILDCHECK: return RPMSCRIPT_CHECK;
default: break;
}
- return RPMSCRIPT_UNKNOWN;
+ return RPMSCRIPT_MAX;
}
/**
@@ -644,7 +652,7 @@
if (psm->sstates != NULL)
ssp = psm->sstates + tag2slx(psm->scriptTag);
if (ssp != NULL)
- *ssp |= (RPMSCRIPT_STATE_LUA|RPMSCRIPT_STATE_EXEC);
+ *ssp |= (RPMSCRIPT_STATE_EMBEDDED|RPMSCRIPT_STATE_EXEC);
av[0] = (char *) Phe->p.argv[0];
if (arg1 >= 0)
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.h
============================================================================
$ cvs diff -u -r2.74 -r2.75 psm.h
--- rpm/lib/psm.h 14 May 2009 16:58:24 -0000 2.74
+++ rpm/lib/psm.h 30 May 2009 18:58:48 -0000 2.75
@@ -69,20 +69,25 @@
* Scriptlet identifiers.
*/
typedef enum rpmScriptID_e {
- RPMSCRIPT_UNKNOWN = 0, /*!< unknown scriptlet */
- RPMSCRIPT_PRETRANS = 1, /*!< %pretrans scriptlet */
- RPMSCRIPT_TRIGGERPREIN = 2, /*!< %triggerprein scriptlet */
- RPMSCRIPT_PREIN = 3, /*!< %pre scriptlet */
- RPMSCRIPT_POSTIN = 4, /*!< %post scriptlet */
- RPMSCRIPT_TRIGGERIN = 5, /*!< %triggerin scriptlet */
- RPMSCRIPT_TRIGGERUN = 6, /*!< %triggerun scriptlet */
- RPMSCRIPT_PREUN = 7, /*!< %preun scriptlet */
- RPMSCRIPT_POSTUN = 8, /*!< %postun scriptlet */
- RPMSCRIPT_TRIGGERPOSTUN = 9, /*!< %triggerpostun scriptlet */
- RPMSCRIPT_POSTTRANS = 10, /*!< %posttrans scriptlet */
- /* 11-15 unused */
- RPMSCRIPT_VERIFY = 16, /*!< %verify scriptlet */
- RPMSCRIPT_SANITYCHECK = 17, /*!< %sanitycheck scriptlet */
+ RPMSCRIPT_PRETRANS = 0, /*!< %pretrans scriptlet */
+ RPMSCRIPT_TRIGGERPREIN = 1, /*!< %triggerprein scriptlet */
+ RPMSCRIPT_PREIN = 2, /*!< %pre scriptlet */
+ RPMSCRIPT_POSTIN = 3, /*!< %post scriptlet */
+ RPMSCRIPT_TRIGGERIN = 4, /*!< %triggerin scriptlet */
+ RPMSCRIPT_TRIGGERUN = 5, /*!< %triggerun scriptlet */
+ RPMSCRIPT_PREUN = 6, /*!< %preun scriptlet */
+ RPMSCRIPT_POSTUN = 7, /*!< %postun scriptlet */
+ RPMSCRIPT_TRIGGERPOSTUN = 8, /*!< %triggerpostun scriptlet */
+ RPMSCRIPT_POSTTRANS = 9, /*!< %posttrans scriptlet */
+ /* 10-15 unused */
+ RPMSCRIPT_VERIFY = 16, /*!< %verify scriptlet */
+ RPMSCRIPT_SANITYCHECK = 17, /*!< %sanitycheck scriptlet */
+ /* 18-23 unused */
+ RPMSCRIPT_PREP = 24, /*!< %prep build scriptlet */
+ RPMSCRIPT_BUILD = 25, /*!< %build build scriptlet */
+ RPMSCRIPT_INSTALL = 26, /*!< %install build scriptlet */
+ RPMSCRIPT_CHECK = 27, /*!< %check build scriptlet */
+ /* 28-31 unused */
RPMSCRIPT_MAX = 32
} rpmScriptID;
@@ -96,8 +101,8 @@
RPMSCRIPT_STATE_REAPED = (1 << 17), /*!< scriptlet was reaped */
/* 18-23 unused */
RPMSCRIPT_STATE_SELINUX = (1 << 24), /*!< scriptlet exec by SELinux */
- RPMSCRIPT_STATE_EMULATOR = (1 << 25), /*!< scriptlet exec in emulator */
- RPMSCRIPT_STATE_LUA = (1 << 26) /*!< scriptlet exec with
lua */
+ RPMSCRIPT_STATE_EMBEDDED = (1 << 25), /*!< scriptlet exec by lua et al */
+ /* 26-31 unused */
} rpmScriptState;
/**
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
