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 19:11:09
Branch: HEAD Handle: 2007120318110801
Modified files:
rpm CHANGES
rpm/build files.c pack.c
rpm/lib fsm.c fsm.h psm.c rpmfi.c rpmfi.h rpmlib.h rpmts.h
transaction.c verify.c
Log:
- rpm.org: Move file action enums to rpmfi where they logically
belong.
Summary:
Revision Changes Path
1.1918 +1 -0 rpm/CHANGES
1.300 +1 -3 rpm/build/files.c
2.265 +1 -4 rpm/build/pack.c
2.139 +1 -2 rpm/lib/fsm.c
2.33 +1 -0 rpm/lib/fsm.h
2.272 +1 -3 rpm/lib/psm.c
2.108 +1 -3 rpm/lib/rpmfi.c
2.46 +21 -0 rpm/lib/rpmfi.h
2.453 +0 -21 rpm/lib/rpmlib.h
2.89 +1 -0 rpm/lib/rpmts.h
1.359 +1 -3 rpm/lib/transaction.c
2.181 +1 -4 rpm/lib/verify.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1917 -r1.1918 CHANGES
--- rpm/CHANGES 3 Dec 2007 17:42:24 -0000 1.1917
+++ rpm/CHANGES 3 Dec 2007 18:11:08 -0000 1.1918
@@ -1,4 +1,5 @@
5.0a4 -> 5.0b1:
+ - rpm.org: Move file action enums to rpmfi where they logically belong.
- rpm.org: Move rpmprobFilterFlag enums to rpmps where they logically
belong
- rpm.org: Move rpmtransFlags enums to rpmts.h where it logically
belongs.
- jbj: hijack rse's versioning name space, add to *.rpm packages too.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/files.c
============================================================================
$ cvs diff -u -r1.299 -r1.300 files.c
--- rpm/build/files.c 3 Dec 2007 17:37:23 -0000 1.299
+++ rpm/build/files.c 3 Dec 2007 18:11:08 -0000 1.300
@@ -17,6 +17,7 @@
#include <rpmio_internal.h>
#include <fts.h>
+#define _RPMFI_INTERNAL
#define _RPMTE_INTERNAL
#include <rpmbuild.h>
@@ -25,9 +26,6 @@
#include "argv.h"
#include "rpmfc.h"
-#define _RPMFI_INTERNAL
-#include "rpmfi.h"
-
#include "buildio.h"
#include "legacy.h" /* XXX dodigest */
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
============================================================================
$ cvs diff -u -r2.264 -r2.265 pack.c
--- rpm/build/pack.c 3 Dec 2007 17:19:28 -0000 2.264
+++ rpm/build/pack.c 3 Dec 2007 18:11:08 -0000 2.265
@@ -6,6 +6,7 @@
#include "system.h"
#include <rpmio_internal.h>
+#define _RPMFI_INTERNAL /* XXX fi->fsm */
#define _RPMEVR_INTERNAL /* XXX RPMSENSE_ANY */
#include <rpmbuild.h>
#include "signature.h" /* XXX rpmTempFile */
@@ -13,10 +14,6 @@
#include "cpio.h"
#include "fsm.h"
-#define _RPMFI_INTERNAL /* XXX fi->fsm */
-#include "rpmfi.h"
-#include "rpmts.h"
-
#include "buildio.h"
#include "signature.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
============================================================================
$ cvs diff -u -r2.138 -r2.139 fsm.c
--- rpm/lib/fsm.c 24 Nov 2007 23:55:01 -0000 2.138
+++ rpm/lib/fsm.c 3 Dec 2007 18:11:09 -0000 2.139
@@ -13,11 +13,10 @@
#include "cpio.h"
#include "tar.h"
+#define _RPMFI_INTERNAL
#include "fsm.h"
#define fsmUNSAFE fsmStage
-#define _RPMFI_INTERNAL
-#include "rpmfi.h"
#include "rpmte.h"
#include "rpmts.h"
#include "rpmsq.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.h
============================================================================
$ cvs diff -u -r2.32 -r2.33 fsm.h
--- rpm/lib/fsm.h 25 May 2007 17:36:02 -0000 2.32
+++ rpm/lib/fsm.h 3 Dec 2007 18:11:09 -0000 2.33
@@ -7,6 +7,7 @@
*/
#include "cpio.h"
+#include "rpmfi.h" /* XXX fileAction typedef */
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
============================================================================
$ cvs diff -u -r2.271 -r2.272 psm.c
--- rpm/lib/psm.c 28 Nov 2007 00:19:45 -0000 2.271
+++ rpm/lib/psm.c 3 Dec 2007 18:11:09 -0000 2.272
@@ -14,6 +14,7 @@
#include <rpmlib.h>
#include "cpio.h"
+#define _RPMFI_INTERNAL
#include "fsm.h" /* XXX CPIO_FOO/FSM_FOO constants */
#define _RPMSQ_INTERNAL
#include "psm.h"
@@ -21,9 +22,6 @@
#define _RPMEVR_INTERNAL
#include "rpmds.h"
-#define _RPMFI_INTERNAL
-#include "rpmfi.h"
-
#define _RPMTE_INTERNAL
#include "rpmte.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.107 -r2.108 rpmfi.c
--- rpm/lib/rpmfi.c 27 Nov 2007 03:29:13 -0000 2.107
+++ rpm/lib/rpmfi.c 3 Dec 2007 18:11:09 -0000 2.108
@@ -11,14 +11,12 @@
#include <rpmlib.h>
#include "cpio.h" /* XXX CPIO_FOO */
+#define _RPMFI_INTERNAL
#include "fsm.h" /* XXX newFSM() */
#include "legacy.h" /* XXX dodigest */
#include "rpmds.h"
-#define _RPMFI_INTERNAL
-#include "rpmfi.h"
-
#define _RPMTE_INTERNAL /* relocations */
#include "rpmte.h"
#include "rpmts.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.h
============================================================================
$ cvs diff -u -r2.45 -r2.46 rpmfi.h
--- rpm/lib/rpmfi.h 3 Nov 2007 23:44:01 -0000 2.45
+++ rpm/lib/rpmfi.h 3 Dec 2007 18:11:09 -0000 2.46
@@ -28,7 +28,28 @@
SOCK = 12 /*!< socket */
} rpmFileTypes;
+/**
+ * File disposition(s) during package install/erase transaction.
+ */
+typedef enum fileAction_e {
+ FA_UNKNOWN = 0, /*!< initial action for file ... */
+ FA_CREATE, /*!< ... copy in from payload. */
+ FA_COPYIN, /*!< ... copy in from payload. */
+ FA_COPYOUT, /*!< ... copy out to payload. */
+ FA_BACKUP, /*!< ... renamed with ".rpmorig" extension. */
+ FA_SAVE, /*!< ... renamed with ".rpmsave" extension. */
+ FA_SKIP, /*!< ... already replaced, don't remove. */
+ FA_ALTNAME, /*!< ... create with ".rpmnew" extension. */
+ FA_ERASE, /*!< ... to be removed. */
+ FA_SKIPNSTATE, /*!< ... untouched, state "not installed". */
+ FA_SKIPNETSHARED, /*!< ... untouched, state "netshared". */
+ FA_SKIPCOLOR /*!< ... untouched, state "wrong color". */
+} fileAction;
+
#if defined(_RPMFI_INTERNAL)
+#define XFA_SKIPPING(_a) \
+ ((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED ||
(_a) == FA_SKIPCOLOR)
+
/** \ingroup rpmfi
* A package filename set.
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.452 -r2.453 rpmlib.h
--- rpm/lib/rpmlib.h 3 Dec 2007 17:42:24 -0000 2.452
+++ rpm/lib/rpmlib.h 3 Dec 2007 18:11:09 -0000 2.453
@@ -300,27 +300,6 @@
int rpmVersionCompare(Header first, Header second)
/[EMAIL PROTECTED]/;
-/**
- * File disposition(s) during package install/erase transaction.
- */
-typedef enum fileAction_e {
- FA_UNKNOWN = 0, /*!< initial action for file ... */
- FA_CREATE, /*!< ... copy in from payload. */
- FA_COPYIN, /*!< ... copy in from payload. */
- FA_COPYOUT, /*!< ... copy out to payload. */
- FA_BACKUP, /*!< ... renamed with ".rpmorig" extension. */
- FA_SAVE, /*!< ... renamed with ".rpmsave" extension. */
- FA_SKIP, /*!< ... already replaced, don't remove. */
- FA_ALTNAME, /*!< ... create with ".rpmnew" extension. */
- FA_ERASE, /*!< ... to be removed. */
- FA_SKIPNSTATE, /*!< ... untouched, state "not installed". */
- FA_SKIPNETSHARED, /*!< ... untouched, state "netshared". */
- FA_SKIPCOLOR /*!< ... untouched, state "wrong color". */
-} fileAction;
-
-#define XFA_SKIPPING(_a) \
- ((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED ||
(_a) == FA_SKIPCOLOR)
-
/** \ingroup payload
* Iterator across package file info, forward on install, backward on erase.
*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.h
============================================================================
$ cvs diff -u -r2.88 -r2.89 rpmts.h
--- rpm/lib/rpmts.h 3 Dec 2007 17:37:23 -0000 2.88
+++ rpm/lib/rpmts.h 3 Dec 2007 18:11:09 -0000 2.89
@@ -7,6 +7,7 @@
*/
#include "rpmps.h"
+#include "rpmfi.h"
#include "rpmsw.h"
#include "rpmsx.h"
#include <rpmpgp.h> /* XXX pgpVSFlags */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/transaction.c
============================================================================
$ cvs diff -u -r1.358 -r1.359 transaction.c
--- rpm/lib/transaction.c 3 Dec 2007 17:37:23 -0000 1.358
+++ rpm/lib/transaction.c 3 Dec 2007 18:11:09 -0000 1.359
@@ -8,6 +8,7 @@
#include <rpmmacro.h> /* XXX for rpmExpand */
#include <rpmtag.h>
+#define _RPMFI_INTERNAL
#define _RPMTE_INTERNAL
#define _RPMTS_INTERNAL
#include "rpmcli.h" /* IDTX prototypes */
@@ -23,9 +24,6 @@
#include "rpmlock.h"
-#define _RPMFI_INTERNAL
-#include "rpmfi.h"
-
#include "cpio.h"
#include "fprint.h"
#include "legacy.h" /* XXX dodigest */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/verify.c
============================================================================
$ cvs diff -u -r2.180 -r2.181 verify.c
--- rpm/lib/verify.c 26 Nov 2007 05:16:50 -0000 2.180
+++ rpm/lib/verify.c 3 Dec 2007 18:11:09 -0000 2.181
@@ -6,15 +6,12 @@
#include "system.h"
#include <rpmio.h>
+#define _RPMFI_INTERNAL
#define _RPMPS_INTERNAL /* XXX rpmps needs iterator. */
#include <rpmcli.h>
#define _RPMSQ_INTERNAL
#include "psm.h"
-#define _RPMFI_INTERNAL
-#include "rpmfi.h"
-
-#include "rpmts.h"
#include "legacy.h" /* XXX dodigest(), uidToUname(), gnameToGid */
#include "ugid.h"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
