diff options
| author | Dan McGee <dan@archlinux.org> | 2007-06-04 16:37:00 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-06-04 23:00:30 +0200 |
| commit | d9ff7bbcd2eef852f18ad65d79aa6b6f7c58535c (patch) | |
| tree | 1f8fb2f1b794906300ca14ac68b592136a898de1 /src/pacman/pacman.c | |
| parent | a094deacf4f6abbef10c6acf38190d4fa9d34f0e (diff) | |
| download | pacman-d9ff7bbcd2eef852f18ad65d79aa6b6f7c58535c.tar.gz pacman-d9ff7bbcd2eef852f18ad65d79aa6b6f7c58535c.tar.xz | |
Remove hardcoded defines from libalpm
Remove any use of the former path variables defined by the Makefiles or
config.h. These are now runtime configurable only with pacman.conf (or by
using flags on the command line).
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/pacman.c')
| -rw-r--r-- | src/pacman/pacman.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index f0ae3287..0b95ac15 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -520,7 +520,7 @@ int main(int argc, char *argv[]) (config->op_s_search || config->group || config->op_q_list || config->op_q_info || config->flags & PM_TRANS_FLAG_PRINTURIS)) || (config->op == PM_OP_DEPTEST && config->op_d_resolve) - || (strcmp(alpm_option_get_root(), ROOTDIR) != 0)) { + || (strcmp(alpm_option_get_root(), "/") != 0)) { /* special case: PM_OP_SYNC can be used w/ config->op_s_search by any user */ /* special case: ignore root user check if -r is specified, fall back on * normal FS checking */ @@ -551,10 +551,10 @@ int main(int argc, char *argv[]) if(config->verbose > 0) { printf("Root : %s\n", alpm_option_get_root()); printf("Conf File : %s\n", config->configfile); - printf("Lock File : %s\n", alpm_option_get_lockfile()); - printf("Root : %s\n", alpm_option_get_root()); printf("DBPath : %s\n", alpm_option_get_dbpath()); printf("CacheDir : %s\n", alpm_option_get_cachedir()); + printf("Lock File : %s\n", alpm_option_get_lockfile()); + printf("Log File : %s\n", alpm_option_get_logfile()); list_display("Targets :", pm_targets); } |