summaryrefslogtreecommitdiffstats
path: root/src/pacman/conf.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-06-03 23:13:04 +0200
committerDan McGee <dan@archlinux.org>2011-06-07 18:37:05 +0200
commit4fdcf50d6696709fde8942fee592ab076ddb6004 (patch)
treecd827a928224672b522fcc8e0c665a2538d35c64 /src/pacman/conf.h
parent19755b648c80f637a430ba5c914db76264024c9a (diff)
downloadpacman-4fdcf50d6696709fde8942fee592ab076ddb6004.tar.gz
pacman-4fdcf50d6696709fde8942fee592ab076ddb6004.tar.xz
Revamp pacman setup code to handle new alpm initialize routine
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/conf.h')
-rw-r--r--src/pacman/conf.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 76c76cf5..4c44bfdd 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -32,6 +32,10 @@ typedef struct __config_t {
unsigned short noprogressbar;
unsigned short logmask;
unsigned short print;
+ unsigned short checkspace;
+ unsigned short usesyslog;
+ unsigned short usedelta;
+ char *arch;
char *print_format;
/* unfortunately, we have to keep track of paths both here and in the library
* because they can come from both the command line or config file, and we
@@ -41,7 +45,7 @@ typedef struct __config_t {
char *dbpath;
char *logfile;
char *gpgdir;
- /* TODO how to handle cachedirs? */
+ alpm_list_t *cachedirs;
unsigned short op_q_isfile;
unsigned short op_q_info;
@@ -64,9 +68,10 @@ typedef struct __config_t {
unsigned short op_s_upgrade;
unsigned short group;
- pmtransflag_t flags;
unsigned short noask;
unsigned int ask;
+ pmtransflag_t flags;
+ pgp_verify_t sigverify;
/* conf file options */
/* I Love Candy! */
@@ -80,7 +85,14 @@ typedef struct __config_t {
unsigned short cleanmethod;
alpm_list_t *holdpkg;
alpm_list_t *syncfirst;
+ alpm_list_t *ignorepkg;
+ alpm_list_t *ignoregrp;
+ alpm_list_t *noupgrade;
+ alpm_list_t *noextract;
char *xfercommand;
+
+ /* our connection to libalpm */
+ pmhandle_t *handle;
} config_t;
/* Operations */