diff options
| author | Dan McGee <dan@archlinux.org> | 2007-08-22 03:28:05 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-08-22 03:28:05 +0200 |
| commit | c22e381a8b86412b6c181446128affe32ab1d71e (patch) | |
| tree | 198d527a3d49819f57fabd8355673328969cc893 /src/pacman/conf.h | |
| parent | 13525255dcd257e69d7c246bf32ceb263fbc31b9 (diff) | |
| download | pacman-c22e381a8b86412b6c181446128affe32ab1d71e.tar.gz pacman-c22e381a8b86412b6c181446128affe32ab1d71e.tar.xz | |
Post trial install changes, round one
A bunch of changes related to my first "real" install of pacman-git into
/usr/local and trying to use it.
* Shift some uses of free -> FREE in libalpm.
* Move stat and sanity checks of config paths into libalpm from the
config and argument parsing in pacman.c.
* Fix issue where dbpath still was not defined early enough due to its
requirement for being used in alpm_db_register. This should be rewritten
so it doesn't have this dependency, but this will work for now.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/conf.h')
| -rw-r--r-- | src/pacman/conf.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 4acf9072..6e6bdb81 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -24,7 +24,6 @@ #include <alpm.h> typedef struct __config_t { - /* command line options */ char *configfile; unsigned short op; unsigned short verbose; @@ -34,8 +33,11 @@ typedef struct __config_t { unsigned short noconfirm; unsigned short noprogressbar; unsigned short logmask; + /* keep track if we had paths specified on command line */ + unsigned short have_root; + unsigned short have_dbpath; + unsigned short have_logfile; - /* command line options */ unsigned short op_q_isfile; unsigned short op_q_info; unsigned short op_q_list; @@ -48,6 +50,7 @@ typedef struct __config_t { unsigned short op_q_changelog; unsigned short op_q_test; unsigned short op_q_upgrade; + unsigned short op_s_clean; unsigned short op_s_dependsonly; unsigned short op_s_downloadonly; @@ -55,10 +58,12 @@ typedef struct __config_t { unsigned short op_s_sync; unsigned short op_s_search; unsigned short op_s_upgrade; + unsigned short group; pmtransflag_t flags; unsigned short noask; unsigned int ask; + /* conf file options */ unsigned short chomp; /* I Love Candy! */ unsigned short usecolor; /* enable colorful output */ |