Move file action enums to rpmfi where they logically belong

This commit is contained in:
Panu Matilainen 2007-12-02 22:50:55 +02:00
parent bb7e7862e5
commit 361a8e697b
4 changed files with 23 additions and 21 deletions

View File

@ -7,6 +7,7 @@
*/
#include "lib/cpio.h"
#include <rpmfi.h>
extern int _fsm_debug;

View File

@ -65,6 +65,27 @@ typedef enum rpmfileAttrs_e {
#define RPMFILE_ALL ~(RPMFILE_NONE)
/** \ingroup rpmfi
* File disposition(s) during package install/erase transaction.
*/
typedef enum rpmFileAction_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". */
} rpmFileAction;
#define XFA_SKIPPING(_a) \
((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED || (_a) == FA_SKIPCOLOR)
/** \ingroup rpmfi
* Unreference a file info set instance.
* @param fi file info set

View File

@ -628,27 +628,6 @@ typedef struct rpmRelocation_s {
*/
int rpmVersionCompare(Header first, Header second);
/**
* File disposition(s) during package install/erase transaction.
*/
typedef enum rpmFileAction_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". */
} rpmFileAction;
#define XFA_SKIPPING(_a) \
((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED || (_a) == FA_SKIPCOLOR)
/** \ingroup header
* Perform simple sanity and range checks on header tag(s).
* @param il no. of tags in header

View File

@ -10,6 +10,7 @@
#include <rpmps.h>
#include <rpmsw.h>
#include <rpmpgp.h>
#include <rpmfi.h>
#include <rpmcallback.h>
#ifdef __cplusplus