diff options
| author | Dan McGee <dan@archlinux.org> | 2009-09-15 05:06:28 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-09-15 05:06:28 +0200 |
| commit | bc24c002fedc9a554c1fd6a9650f548ee55bd49c (patch) | |
| tree | 6c6d99807cade9596d799dde446d9984dafb52d2 | |
| parent | a2cd48960e33043f75c81e0ecbc2d33b20b695fe (diff) | |
| download | pacman-bc24c002fedc9a554c1fd6a9650f548ee55bd49c.tar.gz pacman-bc24c002fedc9a554c1fd6a9650f548ee55bd49c.tar.xz | |
Revert "Fix a memleak involving lazy DB loading"
This doesn't quite work, as can be seen by the pactest results:
Total = 179
Pass = 108 ( 60.34%)
Expected Fail = 5 ( 2.79%)
Unexpected Pass = 0 ( 0.00%)
Fail = 66 ( 36.87%)
If you peek inside '_alpm_db_new' when it gets called for the sync
databases, the base dbpath is still at the default value, causing things
like pactest to fail miserably. We need some further work to do fully lazy
loading, and that belongs on master, not maint.
This reverts commit a2cd48960e33043f75c81e0ecbc2d33b20b695fe.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | src/pacman/pacman.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 92aa4954..77c558d1 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -749,8 +749,11 @@ static int _parseconfig(const char *file, const char *givensection, ret = 1; goto cleanup; } - /* if we are not looking at the options section, register a db */ + /* if we are not looking at the options section, register a db and also + * ensure we have set all of our library paths as the library is too stupid + * at the moment to do lazy opening of the databases */ if(strcmp(section, "options") != 0) { + setlibpaths(); db = alpm_db_register_sync(section); if(db == NULL) { pm_printf(PM_LOG_ERROR, _("could not register '%s' database (%s)\n"), |