diff options
| author | Dan McGee <dan@archlinux.org> | 2011-01-29 00:41:15 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-01-29 19:13:56 +0100 |
| commit | ef86da97f54a90ee4ba3ba8ea7963135e7bae8ed (patch) | |
| tree | 99c492d170d3780ac2530413031593cc248a8fd3 /src/pacman/database.c | |
| parent | 9b876fff09f2af10cba6824bec03d8fe3e167b5b (diff) | |
| download | pacman-ef86da97f54a90ee4ba3ba8ea7963135e7bae8ed.tar.gz pacman-ef86da97f54a90ee4ba3ba8ea7963135e7bae8ed.tar.xz | |
Remove need to explicitly register the local DB
Perform the cheap struct and string setup of the local DB at handle
initialization time to match the teardown we do when releasing the handle.
If the local DB is not needed, all real initialization is done lazily after
DB paths and other things have been configured anyway.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman/database.c')
| -rw-r--r-- | src/pacman/database.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pacman/database.c b/src/pacman/database.c index 5fd33ea5..36433f33 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -31,8 +31,6 @@ #include "conf.h" #include "util.h" -extern pmdb_t *db_local; - /** * @brief Modify the 'local' package database. * @@ -43,6 +41,7 @@ extern pmdb_t *db_local; int pacman_database(alpm_list_t *targets) { alpm_list_t *i; + pmdb_t *db_local; int retval = 0; pmpkgreason_t reason; @@ -65,6 +64,7 @@ int pacman_database(alpm_list_t *targets) return(1); } + db_local = alpm_option_get_localdb(); for(i = targets; i; i = alpm_list_next(i)) { char *pkgname = i->data; if(alpm_db_set_pkgreason(db_local, pkgname, reason) == -1) { |