RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 08-Dec-2008 05:04:24
Branch: HEAD Handle: 2008120804042301
Modified files:
rpm CHANGES macros.in
rpm/lib poptI.c rpmte.h rpmts.h transaction.c
rpm/rpmdb rpmtag.h
Log:
- transFlags: regroup bits together in poptI table.
- transFlags: use POPT_SET_BIT consistently, no callbacks needed.
- transFlags: add --nopretrans/--noposttrans disablers.
Summary:
Revision Changes Path
1.2673 +7 -3 rpm/CHANGES
2.49 +73 -114 rpm/lib/poptI.c
2.55 +2 -1 rpm/lib/rpmte.h
2.109 +6 -3 rpm/lib/rpmts.h
1.389 +6 -3 rpm/lib/transaction.c
1.262 +2 -2 rpm/macros.in
1.54 +6 -2 rpm/rpmdb/rpmtag.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2672 -r1.2673 CHANGES
--- rpm/CHANGES 8 Dec 2008 01:48:37 -0000 1.2672
+++ rpm/CHANGES 8 Dec 2008 04:04:23 -0000 1.2673
@@ -1,10 +1,14 @@
5.2a2 -> 5.2a3:
+ - jbj: transFlags: regroup bits together in poptI table.
+ - jbj: transFlags: use POPT_SET_BIT consistently, no callbacks needed.
+ - jbj: transFlags: add --nopretrans/--noposttrans disablers.
+ - jbj: lua: disable embedded socket/crypto/xmlrpc modules. external
instead.
- jbj: sketch in %remove file flag, surely gonna change before finished.
- - jbj: eliminate --nomd5, use --nofdigests instead.
+ - jbj: transFlags: eliminate --nomd5, use --nofdigests instead.
- jbj: sketch in arbitrary per-package Transflags: tag.
- - jbj: add RPMTRANS_FLAGS_NORPMDB and --norpmdb disablers.
- - jbj: eliminate (never implemented) RPMTRANS_KEEP_OBSOLETES.
+ - jbj: transFlags: add RPMTRANS_FLAGS_NORPMDB and --norpmdb disablers.
+ - jbj: transFlags: eliminate (never implemented) RPMTRANS_KEEP_OBSOLETES.
- jbj: python: remove compile warnings from rpmWriteHeaders() addition.
- afb: rpmrepo: fix installed size bug (wrong value being written)
- pixel: handle posttrans p with no body.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptI.c
============================================================================
$ cvs diff -u -r2.48 -r2.49 poptI.c
--- rpm/lib/poptI.c 8 Dec 2008 01:20:01 -0000 2.48
+++ rpm/lib/poptI.c 8 Dec 2008 04:04:24 -0000 2.49
@@ -177,18 +177,6 @@
ia->noDeps = 1;
break;
- case RPMCLI_POPT_NOFDIGESTS:
- ia->transFlags |= RPMTRANS_FLAG_NOFDIGESTS;
- break;
-
- case RPMCLI_POPT_NOCONTEXTS:
- ia->transFlags |= RPMTRANS_FLAG_NOCONTEXTS;
- break;
-
- case RPMCLI_POPT_NOSCRIPTS:
- ia->transFlags |= (_noTransScripts | _noTransTriggers);
- break;
-
}
}
@@ -202,68 +190,96 @@
installArgCallback, 0, NULL, NULL },
/[EMAIL PROTECTED]@*/
-#if 0
- { "aid", '\0', POPT_BIT_SET, &rpmIArgs.depFlags, RPMDEPS_FLAG_ADDINDEPS,
- N_("add suggested packages to transaction"), NULL },
- { "anaconda", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_ANACONDA|RPMDEPS_FLAG_DEPLOOPS,
- N_("use anaconda \"presentation order\""), NULL},
- { "deploops", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_DEPLOOPS,
- N_("print dependency loops as warning"), NULL},
- { "nosuggest", '\0', POPT_BIT_SET,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_NOSUGGEST,
- N_("do not suggest missing dependency resolution(s)"), NULL},
- { "noconflicts", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_NOCONFLICTS,
- N_("do not check added package conflicts"), NULL},
- { "nolinktos", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_NOLINKTOS,
- N_("ignore added package requires on symlink targets"), NULL},
- { "noobsoletes", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_NOOBSOLETES,
- N_("ignore added package obsoletes"), NULL},
- { "noparentdirs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_NOPARENTDIRS,
- N_("ignore added package requires on file parent directory"), NULL},
- { "norequires", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_NOREQUIRES,
- N_("do not check added package requires"), NULL},
- { "noupgrade", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.depFlags, RPMDEPS_FLAG_NOUPGRADE,
- N_("ignore added package upgrades"), NULL},
-#endif
-
{ "allfiles", '\0', POPT_BIT_SET,
&rpmIArgs.transFlags, RPMTRANS_FLAG_ALLFILES,
N_("install all files, even configurations which might otherwise be
skipped"),
NULL},
- { "allmatches", '\0', POPT_BIT_SET,
- &rpmIArgs.installInterfaceFlags, INSTALL_ALLMATCHES,
- N_("remove all packages which match <package> (normally an error is
generated if <package> specified multiple packages)"),
- NULL},
-
{ "apply", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags,
(_noTransScripts|_noTransTriggers|
RPMTRANS_FLAG_APPLYONLY|RPMTRANS_FLAG_PKGCOMMIT),
N_("do not execute package scriptlet(s)"), NULL },
-
- { "badreloc", '\0', POPT_BIT_SET,
- &rpmIArgs.probFilter, RPMPROB_FILTER_FORCERELOCATE,
- N_("relocate files in non-relocatable package"), NULL},
-
{ "dirstash", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
&rpmIArgs.transFlags, RPMTRANS_FLAG_DIRSTASH,
N_("save erased package files by renaming into sub-directory"), NULL},
- { "erase", 'e', POPT_BIT_SET,
- &rpmIArgs.installInterfaceFlags, INSTALL_ERASE,
- N_("erase (uninstall) package"), N_("<package>+") },
{ "excludeconfigs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
&rpmIArgs.transFlags, RPMTRANS_FLAG_NOCONFIGS,
N_("do not install configuration files"), NULL},
{ "excludedocs", '\0', POPT_BIT_SET,
&rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS,
N_("do not install documentation"), NULL},
+ { "justdb", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_JUSTDB,
+ N_("update the database, but do not modify the filesystem"), NULL},
+ { "noconfigs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOCONFIGS,
+ N_("do not install configuration files"), NULL},
+ { "nodocs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS,
+ N_("do not install documentation"), NULL},
+ { "nocontexts", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOCONTEXTS,
+ N_("don't install file security contexts"), NULL},
+ { "nofdigests", '\0', POPT_BIT_SET,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOFDIGESTS,
+ N_("don't verify file digests"), NULL },
+ { "norpmdb", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NORPMDB,
+ N_("don't register headers in rpmdb"), NULL},
+
+ { "noscripts", '\0', POPT_BIT_SET,
+ &rpmIArgs.transFlags, (_noTransScripts|_noTransTriggers),
+ N_("do not execute package scriptlet(s)"), NULL },
+ { "nopretrans", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPRETRANS,
+ N_("do not execute %%pretrans scriptlet (if any)"), NULL },
+ { "nopre", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPRE,
+ N_("do not execute %%pre scriptlet (if any)"), NULL },
+ { "nopost", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPOST,
+ N_("do not execute %%post scriptlet (if any)"), NULL },
+ { "nopreun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPREUN,
+ N_("do not execute %%preun scriptlet (if any)"), NULL },
+ { "nopostun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPOSTUN,
+ N_("do not execute %%postun scriptlet (if any)"), NULL },
+ { "noposttrans", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOPOSTTRANS,
+ N_("do not execute %%postrans scriptlet (if any)"), NULL },
+
+ { "notriggers", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, _noTransTriggers,
+ N_("do not execute any scriptlet(s) triggered by this package"), NULL},
+ { "notriggerprein", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERPREIN,
+ N_("do not execute any %%triggerprein scriptlet(s)"), NULL},
+ { "notriggerin", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERIN,
+ N_("do not execute any %%triggerin scriptlet(s)"), NULL},
+ { "notriggerun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERUN,
+ N_("do not execute any %%triggerun scriptlet(s)"), NULL},
+ { "notriggerpostun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERPOSTUN,
+ N_("do not execute any %%triggerpostun scriptlet(s)"), NULL},
+
+ { "repackage", '\0', POPT_BIT_SET,
+ &rpmIArgs.transFlags, RPMTRANS_FLAG_REPACKAGE,
+ N_("save erased package files by repackaging"), NULL},
+ { "test", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_TEST,
+ N_("don't install, but tell if it would work or not"), NULL},
+
+ { "allmatches", '\0', POPT_BIT_SET,
+ &rpmIArgs.installInterfaceFlags, INSTALL_ALLMATCHES,
+ N_("remove all packages which match <package> (normally an error is
generated if <package> specified multiple packages)"),
+ NULL},
+
+ { "badreloc", '\0', POPT_BIT_SET,
+ &rpmIArgs.probFilter, RPMPROB_FILTER_FORCERELOCATE,
+ N_("relocate files in non-relocatable package"), NULL},
+
+ { "erase", 'e', POPT_BIT_SET,
+ &rpmIArgs.installInterfaceFlags, INSTALL_ERASE,
+ N_("erase (uninstall) package"), N_("<package>+") },
{ "excludepath", '\0', POPT_ARG_STRING, NULL, POPT_EXCLUDEPATH,
N_("skip files with leading component <path> "),
N_("<path>") },
@@ -295,51 +311,14 @@
{ "install", 'i', 0, NULL, 'i',
N_("install package(s)"), N_("<packagefile>+") },
- { "justdb", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_JUSTDB,
- N_("update the database, but do not modify the filesystem"), NULL},
-
- { "noconfigs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_NOCONFIGS,
- N_("do not install configuration files"), NULL},
{ "nodeps", '\0', 0, NULL, RPMCLI_POPT_NODEPS,
N_("do not verify package dependencies"), NULL },
- { "nodocs", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_NODOCS,
- N_("do not install documentation"), NULL},
-
- { "norpmdb", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_NORPMDB,
- N_("don't register headers in rpmdb"), NULL},
-#ifdef DYING
- { "nomd5", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NOFDIGESTS,
- N_("don't verify file digests"), NULL },
-#endif
- { "nofdigests", '\0', 0, NULL, RPMCLI_POPT_NOFDIGESTS,
- N_("don't verify file digests"), NULL },
- { "nocontexts", '\0',0, NULL, RPMCLI_POPT_NOCONTEXTS,
- N_("don't install file security contexts"), NULL},
{ "noorder", '\0', POPT_BIT_SET,
&rpmIArgs.installInterfaceFlags, INSTALL_NOORDER,
N_("do not reorder package installation to satisfy dependencies"),
NULL},
- { "noscripts", '\0', 0, NULL, RPMCLI_POPT_NOSCRIPTS,
- N_("do not execute package scriptlet(s)"), NULL },
-
- { "nopre", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &rpmIArgs.transFlags,
- RPMTRANS_FLAG_NOPRE,
- N_("do not execute %%pre scriptlet (if any)"), NULL },
- { "nopost", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
&rpmIArgs.transFlags,
- RPMTRANS_FLAG_NOPOST,
- N_("do not execute %%post scriptlet (if any)"), NULL },
- { "nopreun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
&rpmIArgs.transFlags,
- RPMTRANS_FLAG_NOPREUN,
- N_("do not execute %%preun scriptlet (if any)"), NULL },
- { "nopostun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
&rpmIArgs.transFlags,
- RPMTRANS_FLAG_NOPOSTUN,
- N_("do not execute %%postun scriptlet (if any)"), NULL },
-
{ "nodigest", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NODIGEST,
N_("don't verify package digest(s)"), NULL },
{ "nohdrchk", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, RPMCLI_POPT_NOHDRCHK,
@@ -347,21 +326,6 @@
{ "nosignature", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL,
RPMCLI_POPT_NOSIGNATURE,
N_("don't verify package signature(s)"), NULL },
- { "notriggers", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, _noTransTriggers,
- N_("do not execute any scriptlet(s) triggered by this package"), NULL},
- { "notriggerprein", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERPREIN,
- N_("do not execute any %%triggerprein scriptlet(s)"), NULL},
- { "notriggerin", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERIN,
- N_("do not execute any %%triggerin scriptlet(s)"), NULL},
- { "notriggerun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERUN,
- N_("do not execute any %%triggerun scriptlet(s)"), NULL},
- { "notriggerpostun", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_NOTRIGGERPOSTUN,
- N_("do not execute any %%triggerpostun scriptlet(s)"), NULL},
-
{ "oldpackage", '\0', POPT_BIT_SET,
&rpmIArgs.probFilter, RPMPROB_FILTER_OLDPACKAGE,
N_("upgrade to an old version of the package (--force on upgrades does
this automatically)"),
@@ -375,9 +339,6 @@
{ "relocate", '\0', POPT_ARG_STRING, NULL, POPT_RELOCATE,
N_("relocate files from path <old> to <new>"),
N_("<old>=<new>") },
- { "repackage", '\0', POPT_BIT_SET,
- &rpmIArgs.transFlags, RPMTRANS_FLAG_REPACKAGE,
- N_("save erased package files by repackaging"), NULL},
{ "replacefiles", '\0', POPT_BIT_SET, &rpmIArgs.probFilter,
(RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
N_("ignore file conflicts between packages"), NULL},
@@ -393,8 +354,6 @@
{ "rbexclude", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN, NULL,
POPT_ROLLBACK_EXCLUDE,
N_("Exclude Transaction I.D. from rollback"),
N_("<tid>") },
- { "test", '\0', POPT_BIT_SET, &rpmIArgs.transFlags, RPMTRANS_FLAG_TEST,
- N_("don't install, but tell if it would work or not"), NULL},
{ "upgrade", 'U', POPT_BIT_SET,
&rpmIArgs.installInterfaceFlags, (INSTALL_UPGRADE|INSTALL_INSTALL),
N_("upgrade package(s)"),
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.h
============================================================================
$ cvs diff -u -r2.54 -r2.55 rpmte.h
--- rpm/lib/rpmte.h 8 Dec 2008 01:20:01 -0000 2.54
+++ rpm/lib/rpmte.h 8 Dec 2008 04:04:24 -0000 2.55
@@ -133,7 +133,8 @@
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
rpmfi fi; /*!< File information. */
- rpmuint32_t transFlags; /*!< Package transaction disablers. */
+ rpmuint32_t depFlags; /*!< Package depFlags mask. */
+ rpmuint32_t transFlags; /*!< Package transFlags mask. */
rpmuint32_t color; /*!< Color bit(s) from package
dependencies. */
rpmuint32_t pkgFileSize; /*!< No. of bytes in package file (approx). */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.h
============================================================================
$ cvs diff -u -r2.108 -r2.109 rpmts.h
--- rpm/lib/rpmts.h 8 Dec 2008 01:20:01 -0000 2.108
+++ rpm/lib/rpmts.h 8 Dec 2008 04:04:24 -0000 2.109
@@ -87,16 +87,19 @@
RPMTRANS_FLAG_NORPMDB = (1 << 25), /*!< from --norpmdb */
/* 26 unused */
RPMTRANS_FLAG_NOFDIGESTS = (1 << 27), /*!< from --nofdigests */
- /* 28-29 unused */
+ RPMTRANS_FLAG_NOPRETRANS = (1 << 28), /*!< from --nopretrans */
+ RPMTRANS_FLAG_NOPOSTTRANS = (1 << 29), /*!< from --noposttrans
*/
RPMTRANS_FLAG_NOCONFIGS = (1 << 30), /*!< from --noconfigs */
/* 31 unused */
} rpmtransFlags;
#define _noTransScripts \
- ( RPMTRANS_FLAG_NOPRE | \
+ ( RPMTRANS_FLAG_NOPRETRANS | \
+ RPMTRANS_FLAG_NOPRE | \
RPMTRANS_FLAG_NOPOST | \
RPMTRANS_FLAG_NOPREUN | \
- RPMTRANS_FLAG_NOPOSTUN \
+ RPMTRANS_FLAG_NOPOSTUN | \
+ RPMTRANS_FLAG_NOPOSTTRANS \
)
#define _noTransTriggers \
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.388 -r1.389 transaction.c
--- rpm/lib/transaction.c 6 Dec 2008 18:03:25 -0000 1.388
+++ rpm/lib/transaction.c 8 Dec 2008 04:04:24 -0000 1.389
@@ -1316,9 +1316,10 @@
/* Run pre-transaction scripts, but only if there are no known
* problems up to this point. */
- if (!((rpmtsFlags(ts) & (RPMTRANS_FLAG_BUILD_PROBS|RPMTRANS_FLAG_TEST))
+ if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPRETRANS) &&
+ (!((rpmtsFlags(ts) & (RPMTRANS_FLAG_BUILD_PROBS|RPMTRANS_FLAG_TEST))
|| (rpmpsNumProblems(ts->probs) &&
- (okProbs == NULL || rpmpsTrim(ts->probs, okProbs)))))
+ (okProbs == NULL || rpmpsTrim(ts->probs, okProbs))))))
{
rpmlog(RPMLOG_DEBUG, D_("running pre-transaction scripts\n"));
pi = rpmtsiInit(ts);
@@ -1888,7 +1889,9 @@
/[EMAIL PROTECTED]@*/
pi = rpmtsiFree(pi);
- if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)) {
+ if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOSTTRANS) &&
+ !(rpmtsFlags(ts) & RPMTRANS_FLAG_TEST))
+ {
if ((rpmtsFlags(ts) & _noTransTriggers) != _noTransTriggers)
rpmRunFileTriggers(rpmtsRootDir(ts));
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.261 -r1.262 macros.in
--- rpm/macros.in 8 Dec 2008 01:20:01 -0000 1.261
+++ rpm/macros.in 8 Dec 2008 04:04:23 -0000 1.262
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.261 2008/12/08 01:20:01 jbj Exp $
+# $Id: macros.in,v 1.262 2008/12/08 04:04:23 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -543,7 +543,7 @@
#
# Colon separated list of permitted arbitrary tag names
%_arbitrary_tags_debian
Priority:Essential:Depends:Predepends:Recommends:Suggests:Enhances:Breaks
-%_arbitrary_tags
Class:Track:Trackprog:Transflags:%{arbitrary_tags_debian}
+%_arbitrary_tags
Class:Track:Trackprog:Depflags:Transflags:%{arbitrary_tags_debian}
#
# Byte size of line buffer for .spec file parsing
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtag.h
============================================================================
$ cvs diff -u -r1.53 -r1.54 rpmtag.h
--- rpm/rpmdb/rpmtag.h 3 Aug 2008 14:01:00 -0000 1.53
+++ rpm/rpmdb/rpmtag.h 8 Dec 2008 04:04:24 -0000 1.54
@@ -405,7 +405,7 @@
RPMTAG_RPMLIBVERSION = 1199, /* i */
RPMTAG_RPMLIBTIMESTAMP = 1200, /* i */
RPMTAG_RPMLIBVENDOR = 1201, /* i */
- RPMTAG_CLASS = 1202, /* s */
+ RPMTAG_CLASS = 1202, /* s arbitrary */
RPMTAG_TRACK = 1203, /* s internal arbitrary */
RPMTAG_TRACKPROG = 1204, /* s internal arbitrary */
RPMTAG_SANITYCHECK = 1205, /* s */
@@ -423,8 +423,12 @@
RPMTAG_PACKAGEBASEURL = 1217, /* s */
/[EMAIL PROTECTED]@*/
- RPMTAG_FIRSTFREE_TAG /*!< internal */
+ RPMTAG_FIRSTFREE_TAG, /*!< internal */
/[EMAIL PROTECTED]@*/
+
+ RPMTAG_PACKAGETRANSFLAGS = 0x4efaafd9, /* s[] arbitrary */
+ RPMTAG_PACKAGEDEPFLAGS = 0x748a8314, /* s[] arbitrary */
+ RPMTAG_LASTARBITRARY_TAG = 0x80000000 /*!< internal */
};
#define RPMTAG_EXTERNAL_TAG 1000000
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
