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: 03-Dec-2007 18:37:23
Branch: HEAD Handle: 2007120317372201
Modified files:
rpm CHANGES
rpm/build files.c
rpm/lib depends.c rpmcli.h rpminstall.c rpmlib.h
rpmrollback.c rpmts.h transaction.c
Log:
- rpm.org: Move rpmtransFlags enums to rpmts.h where it logically
belongs.
Summary:
Revision Changes Path
1.1916 +1 -0 rpm/CHANGES
1.299 +1 -3 rpm/build/files.c
1.368 +2 -6 rpm/lib/depends.c
2.76 +2 -0 rpm/lib/rpmcli.h
1.187 +1 -2 rpm/lib/rpminstall.c
2.451 +0 -82 rpm/lib/rpmlib.h
1.30 +3 -6 rpm/lib/rpmrollback.c
2.88 +82 -0 rpm/lib/rpmts.h
1.358 +3 -6 rpm/lib/transaction.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1915 -r1.1916 CHANGES
--- rpm/CHANGES 3 Dec 2007 17:19:27 -0000 1.1915
+++ rpm/CHANGES 3 Dec 2007 17:37:22 -0000 1.1916
@@ -1,4 +1,5 @@
5.0a4 -> 5.0b1:
+ - rpm.org: Move rpmtransFlags enums to rpmts.h where it logically
belongs.
- jbj: hijack rse's versioning name space, add to *.rpm packages too.
- jbj: fix: rpmbuild -ba dir/foo.spec was broken.
- jbj: arbitrary tags w RPM_STRING_ARRAY_TYPE default type, append
assumed.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.298 -r1.299 files.c
--- rpm/build/files.c 27 Nov 2007 02:29:27 -0000 1.298
+++ rpm/build/files.c 3 Dec 2007 17:37:23 -0000 1.299
@@ -17,6 +17,7 @@
#include <rpmio_internal.h>
#include <fts.h>
+#define _RPMTE_INTERNAL
#include <rpmbuild.h>
#include "cpio.h"
@@ -27,9 +28,6 @@
#define _RPMFI_INTERNAL
#include "rpmfi.h"
-#define _RPMTE_INTERNAL
-#include "rpmte.h"
-
#include "buildio.h"
#include "legacy.h" /* XXX dodigest */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.367 -r1.368 depends.c
--- rpm/lib/depends.c 26 Nov 2007 05:16:50 -0000 1.367
+++ rpm/lib/depends.c 3 Dec 2007 17:37:23 -0000 1.368
@@ -5,6 +5,8 @@
#include "system.h"
#include "rpmio_internal.h" /* XXX PGPHASHALGO_MD5 */
+#define _RPMTE_INTERNAL
+#define _RPMTS_INTERNAL
#include <rpmcli.h> /* XXX rpmcliPackagesTotal */
#include <rpmmacro.h> /* XXX
rpmExpand("%{_dependency_whiteout}" */
@@ -22,12 +24,6 @@
#include "rpmds.h"
#include "rpmfi.h"
-#define _RPMTE_INTERNAL
-#include "rpmte.h"
-
-#define _RPMTS_INTERNAL
-#include "rpmts.h"
-
#include "debug.h"
/[EMAIL PROTECTED] tsortInfo @*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmcli.h
============================================================================
$ cvs diff -u -r2.75 -r2.76 rpmcli.h
--- rpm/lib/rpmcli.h 24 Nov 2007 19:46:05 -0000 2.75
+++ rpm/lib/rpmcli.h 3 Dec 2007 17:37:23 -0000 2.76
@@ -12,6 +12,8 @@
#include "rpmurl.h"
#include "rpmlib.h"
#include "rpmps.h"
+#include "rpmte.h"
+#include "rpmts.h"
/** \ingroup rpmcli
* Should version 3 packages be produced?
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
============================================================================
$ cvs diff -u -r1.186 -r1.187 rpminstall.c
--- rpm/lib/rpminstall.c 24 Nov 2007 23:55:01 -0000 1.186
+++ rpm/lib/rpminstall.c 3 Dec 2007 17:37:23 -0000 1.187
@@ -6,6 +6,7 @@
#include <rpmio.h>
#include <rpmtag.h>
+#define _RPMTS_INTERNAL /* XXX ts->suggests */
#include <rpmcli.h>
#include "rpmdb.h"
@@ -14,8 +15,6 @@
#endif
#include "rpmte.h" /* XXX rpmtsPrint() */
-#define _RPMTS_INTERNAL /* XXX ts->suggests */
-#include "rpmts.h"
#include "manifest.h"
#include "rpmgi.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.450 -r2.451 rpmlib.h
--- rpm/lib/rpmlib.h 2 Dec 2007 15:33:54 -0000 2.450
+++ rpm/lib/rpmlib.h 3 Dec 2007 17:37:23 -0000 2.451
@@ -380,88 +380,6 @@
/[EMAIL PROTECTED] ts, _fd, *specFilePtr, *cookie,
rpmGlobalMacroContext,
fileSystem, internalState @*/;
-/** \ingroup rpmts
- * Bit(s) to control rpmtsCheck() and rpmtsOrder() operation.
- * @todo Move to rpmts.h.
- */
-typedef enum rpmdepFlags_e {
- RPMDEPS_FLAG_NONE = 0,
- RPMDEPS_FLAG_NOUPGRADE = (1 << 0), /*!< from --noupgrade */
- RPMDEPS_FLAG_NOREQUIRES = (1 << 1), /*!< from --norequires */
- RPMDEPS_FLAG_NOCONFLICTS = (1 << 2), /*!< from --noconflicts */
- RPMDEPS_FLAG_NOOBSOLETES = (1 << 3), /*!< from --noobsoletes */
- RPMDEPS_FLAG_NOPARENTDIRS = (1 << 4), /*!< from
--noparentdirs */
- RPMDEPS_FLAG_NOLINKTOS = (1 << 5), /*!< from --nolinktos */
- RPMDEPS_FLAG_ANACONDA = (1 << 6), /*!< from --anaconda */
- RPMDEPS_FLAG_NOSUGGEST = (1 << 7), /*!< from --nosuggest */
- RPMDEPS_FLAG_ADDINDEPS = (1 << 8), /*!< from --aid */
- RPMDEPS_FLAG_DEPLOOPS = (1 << 9) /*!< from --deploops */
-} rpmdepFlags;
-
-/** \ingroup rpmts
- * Bit(s) to control rpmtsRun() operation.
- * @todo Move to rpmts.h.
- */
-typedef enum rpmtransFlags_e {
- RPMTRANS_FLAG_NONE = 0,
- RPMTRANS_FLAG_TEST = (1 << 0), /*!< from --test */
- RPMTRANS_FLAG_BUILD_PROBS = (1 << 1), /*!< don't process
payload */
- RPMTRANS_FLAG_NOSCRIPTS = (1 << 2), /*!< from --noscripts */
- RPMTRANS_FLAG_JUSTDB = (1 << 3), /*!< from --justdb */
- RPMTRANS_FLAG_NOTRIGGERS = (1 << 4), /*!< from --notriggers */
- RPMTRANS_FLAG_NODOCS = (1 << 5), /*!< from --excludedocs */
- RPMTRANS_FLAG_ALLFILES = (1 << 6), /*!< from --allfiles */
-/[EMAIL PROTECTED]@*/
- RPMTRANS_FLAG_KEEPOBSOLETE = (1 << 7), /*!< @todo Document. */
-/[EMAIL PROTECTED]@*/
- RPMTRANS_FLAG_NOCONTEXTS = (1 << 8), /*!< from --nocontexts */
- RPMTRANS_FLAG_DIRSTASH = (1 << 9), /*!< from --dirstash */
- RPMTRANS_FLAG_REPACKAGE = (1 << 10), /*!< from --repackage */
-
- RPMTRANS_FLAG_PKGCOMMIT = (1 << 11),
-/[EMAIL PROTECTED]@*/
- RPMTRANS_FLAG_PKGUNDO = (1 << 12),
-/[EMAIL PROTECTED]@*/
- RPMTRANS_FLAG_COMMIT = (1 << 13),
-/[EMAIL PROTECTED]@*/
- RPMTRANS_FLAG_UNDO = (1 << 14),
-/[EMAIL PROTECTED]@*/
- /* 15 unused */
-
- RPMTRANS_FLAG_NOTRIGGERPREIN= (1 << 16), /*!< from --notriggerprein */
- RPMTRANS_FLAG_NOPRE = (1 << 17), /*!< from --nopre */
- RPMTRANS_FLAG_NOPOST = (1 << 18), /*!< from --nopost */
- RPMTRANS_FLAG_NOTRIGGERIN = (1 << 19), /*!< from --notriggerin
*/
- RPMTRANS_FLAG_NOTRIGGERUN = (1 << 20), /*!< from --notriggerun
*/
- RPMTRANS_FLAG_NOPREUN = (1 << 21), /*!< from --nopreun */
- RPMTRANS_FLAG_NOPOSTUN = (1 << 22), /*!< from --nopostun */
- RPMTRANS_FLAG_NOTRIGGERPOSTUN = (1 << 23), /*!< from
--notriggerpostun */
-/[EMAIL PROTECTED]@*/
- RPMTRANS_FLAG_NOPAYLOAD = (1 << 24),
-/[EMAIL PROTECTED]@*/
- RPMTRANS_FLAG_APPLYONLY = (1 << 25),
-
- /* 26 unused */
- RPMTRANS_FLAG_NOFDIGESTS = (1 << 27), /*!< from --nofdigests */
- /* 28-29 unused */
- RPMTRANS_FLAG_NOCONFIGS = (1 << 30), /*!< from --noconfigs */
- /* 31 unused */
-} rpmtransFlags;
-
-#define _noTransScripts \
- ( RPMTRANS_FLAG_NOPRE | \
- RPMTRANS_FLAG_NOPOST | \
- RPMTRANS_FLAG_NOPREUN | \
- RPMTRANS_FLAG_NOPOSTUN \
- )
-
-#define _noTransTriggers \
- ( RPMTRANS_FLAG_NOTRIGGERPREIN | \
- RPMTRANS_FLAG_NOTRIGGERIN | \
- RPMTRANS_FLAG_NOTRIGGERUN | \
- RPMTRANS_FLAG_NOTRIGGERPOSTUN \
- )
-
/[EMAIL PROTECTED]/
#ifdef __cplusplus
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrollback.c
============================================================================
$ cvs diff -u -r1.29 -r1.30 rpmrollback.c
--- rpm/lib/rpmrollback.c 26 Nov 2007 05:16:50 -0000 1.29
+++ rpm/lib/rpmrollback.c 3 Dec 2007 17:37:23 -0000 1.30
@@ -5,17 +5,14 @@
#include "system.h"
#include <rpmio.h>
+#define _RPMTE_INTERNAL /* XXX findErases needs rpmte
internals. */
+#define _RPMTS_INTERNAL /* XXX ts->teErase, ts->probs */
+#define _RPMTS_PRINT
#include <rpmcli.h>
#include "rpmdb.h"
#include "rpmds.h"
-#define _RPMTE_INTERNAL /* XXX findErases needs rpmte
internals. */
-#include "rpmte.h" /* XXX: rpmteChain */
-#define _RPMTS_INTERNAL /* XXX ts->teErase, ts->probs */
-#define _RPMTS_PRINT
-#include "rpmts.h"
-
#include "manifest.h"
#include "misc.h" /* XXX rpmGlob() */
#include "rpmgi.h" /* XXX rpmgiEscapeSpaces */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.h
============================================================================
$ cvs diff -u -r2.87 -r2.88 rpmts.h
--- rpm/lib/rpmts.h 20 Nov 2007 18:44:24 -0000 2.87
+++ rpm/lib/rpmts.h 3 Dec 2007 17:37:23 -0000 2.88
@@ -28,6 +28,88 @@
typedef pgpVSFlags rpmVSFlags;
/** \ingroup rpmts
+ * Bit(s) to control rpmtsCheck() and rpmtsOrder() operation.
+ * @todo Move to rpmts.h.
+ */
+typedef enum rpmdepFlags_e {
+ RPMDEPS_FLAG_NONE = 0,
+ RPMDEPS_FLAG_NOUPGRADE = (1 << 0), /*!< from --noupgrade */
+ RPMDEPS_FLAG_NOREQUIRES = (1 << 1), /*!< from --norequires */
+ RPMDEPS_FLAG_NOCONFLICTS = (1 << 2), /*!< from --noconflicts */
+ RPMDEPS_FLAG_NOOBSOLETES = (1 << 3), /*!< from --noobsoletes */
+ RPMDEPS_FLAG_NOPARENTDIRS = (1 << 4), /*!< from
--noparentdirs */
+ RPMDEPS_FLAG_NOLINKTOS = (1 << 5), /*!< from --nolinktos */
+ RPMDEPS_FLAG_ANACONDA = (1 << 6), /*!< from --anaconda */
+ RPMDEPS_FLAG_NOSUGGEST = (1 << 7), /*!< from --nosuggest */
+ RPMDEPS_FLAG_ADDINDEPS = (1 << 8), /*!< from --aid */
+ RPMDEPS_FLAG_DEPLOOPS = (1 << 9) /*!< from --deploops */
+} rpmdepFlags;
+
+/** \ingroup rpmts
+ * Bit(s) to control rpmtsRun() operation.
+ * @todo Move to rpmts.h.
+ */
+typedef enum rpmtransFlags_e {
+ RPMTRANS_FLAG_NONE = 0,
+ RPMTRANS_FLAG_TEST = (1 << 0), /*!< from --test */
+ RPMTRANS_FLAG_BUILD_PROBS = (1 << 1), /*!< don't process
payload */
+ RPMTRANS_FLAG_NOSCRIPTS = (1 << 2), /*!< from --noscripts */
+ RPMTRANS_FLAG_JUSTDB = (1 << 3), /*!< from --justdb */
+ RPMTRANS_FLAG_NOTRIGGERS = (1 << 4), /*!< from --notriggers */
+ RPMTRANS_FLAG_NODOCS = (1 << 5), /*!< from --excludedocs */
+ RPMTRANS_FLAG_ALLFILES = (1 << 6), /*!< from --allfiles */
+/[EMAIL PROTECTED]@*/
+ RPMTRANS_FLAG_KEEPOBSOLETE = (1 << 7), /*!< @todo Document. */
+/[EMAIL PROTECTED]@*/
+ RPMTRANS_FLAG_NOCONTEXTS = (1 << 8), /*!< from --nocontexts */
+ RPMTRANS_FLAG_DIRSTASH = (1 << 9), /*!< from --dirstash */
+ RPMTRANS_FLAG_REPACKAGE = (1 << 10), /*!< from --repackage */
+
+ RPMTRANS_FLAG_PKGCOMMIT = (1 << 11),
+/[EMAIL PROTECTED]@*/
+ RPMTRANS_FLAG_PKGUNDO = (1 << 12),
+/[EMAIL PROTECTED]@*/
+ RPMTRANS_FLAG_COMMIT = (1 << 13),
+/[EMAIL PROTECTED]@*/
+ RPMTRANS_FLAG_UNDO = (1 << 14),
+/[EMAIL PROTECTED]@*/
+ /* 15 unused */
+
+ RPMTRANS_FLAG_NOTRIGGERPREIN= (1 << 16), /*!< from --notriggerprein */
+ RPMTRANS_FLAG_NOPRE = (1 << 17), /*!< from --nopre */
+ RPMTRANS_FLAG_NOPOST = (1 << 18), /*!< from --nopost */
+ RPMTRANS_FLAG_NOTRIGGERIN = (1 << 19), /*!< from --notriggerin
*/
+ RPMTRANS_FLAG_NOTRIGGERUN = (1 << 20), /*!< from --notriggerun
*/
+ RPMTRANS_FLAG_NOPREUN = (1 << 21), /*!< from --nopreun */
+ RPMTRANS_FLAG_NOPOSTUN = (1 << 22), /*!< from --nopostun */
+ RPMTRANS_FLAG_NOTRIGGERPOSTUN = (1 << 23), /*!< from
--notriggerpostun */
+/[EMAIL PROTECTED]@*/
+ RPMTRANS_FLAG_NOPAYLOAD = (1 << 24),
+/[EMAIL PROTECTED]@*/
+ RPMTRANS_FLAG_APPLYONLY = (1 << 25),
+
+ /* 26 unused */
+ RPMTRANS_FLAG_NOFDIGESTS = (1 << 27), /*!< from --nofdigests */
+ /* 28-29 unused */
+ RPMTRANS_FLAG_NOCONFIGS = (1 << 30), /*!< from --noconfigs */
+ /* 31 unused */
+} rpmtransFlags;
+
+#define _noTransScripts \
+ ( RPMTRANS_FLAG_NOPRE | \
+ RPMTRANS_FLAG_NOPOST | \
+ RPMTRANS_FLAG_NOPREUN | \
+ RPMTRANS_FLAG_NOPOSTUN \
+ )
+
+#define _noTransTriggers \
+ ( RPMTRANS_FLAG_NOTRIGGERPREIN | \
+ RPMTRANS_FLAG_NOTRIGGERIN | \
+ RPMTRANS_FLAG_NOTRIGGERUN | \
+ RPMTRANS_FLAG_NOTRIGGERPOSTUN \
+ )
+
+/** \ingroup rpmts
* Indices for timestamps.
*/
typedef enum rpmtsOpX_e {
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.357 -r1.358 transaction.c
--- rpm/lib/transaction.c 24 Nov 2007 23:55:01 -0000 1.357
+++ rpm/lib/transaction.c 3 Dec 2007 17:37:23 -0000 1.358
@@ -7,6 +7,9 @@
#include <rpmio.h>
#include <rpmmacro.h> /* XXX for rpmExpand */
#include <rpmtag.h>
+
+#define _RPMTE_INTERNAL
+#define _RPMTS_INTERNAL
#include "rpmcli.h" /* IDTX prototypes */
#include "fsm.h"
@@ -23,12 +26,6 @@
#define _RPMFI_INTERNAL
#include "rpmfi.h"
-#define _RPMTE_INTERNAL
-#include "rpmte.h"
-
-#define _RPMTS_INTERNAL
-#include "rpmts.h"
-
#include "cpio.h"
#include "fprint.h"
#include "legacy.h" /* XXX dodigest */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
