summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-02-20 20:59:35 +0000
committerAurelien Foret <aurelien@archlinux.org>2006-02-20 20:59:35 +0000
commit910fd6a687db751a7b95829c2b028d6c5d60c3e8 (patch)
tree1693320bb77a116af58449ce328c9d24144433f9
parent9d4713e2a3b85f3d9d50d543928847f69c395dc7 (diff)
downloadpacman-910fd6a687db751a7b95829c2b028d6c5d60c3e8.tar.xz
the library must provide default values for main options
-rw-r--r--lib/libalpm/handle.c3
-rw-r--r--src/pacman/pacman.c6
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 8d220ada..28f07507 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -76,6 +76,9 @@ pmhandle_t *handle_new()
handle->access = PM_ACCESS_RW;
#endif
+ handle->dbpath = strdup(PM_DBPATH);
+ handle->cachedir = strdup(PM_CACHEDIR);
+
return(handle);
}
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 82765342..73f8c637 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -148,12 +148,6 @@ int main(int argc, char *argv[])
if(parseconfig(config->configfile, config) == -1) {
cleanup(1);
}
- if(config->dbpath == NULL) {
- config->dbpath = strdup(PM_DBPATH);
- }
- if(config->cachedir == NULL) {
- config->cachedir = strdup(PM_CACHEDIR);
- }
/* set library parameters */
if(alpm_set_option(PM_OPT_LOGMASK, (long)config->debug) == -1) {