diff options
| author | Dave Reisner <d@falconindy.com> | 2011-06-24 14:55:32 -0400 |
|---|---|---|
| committer | Dave Reisner <d@falconindy.com> | 2011-06-24 14:55:32 -0400 |
| commit | 2d32a9a3a348d25d6d0f3d12752399bf7fdf6570 (patch) | |
| tree | bb330206ea0caa95c9d337a6c5b4b99b6034e756 /lib/libalpm/alpm.c | |
| parent | 8581694ceb63f4ed2854206b38574599c3d9df28 (diff) | |
| parent | e06586ceb49a0dc7e59996ae3a1483337d2ada05 (diff) | |
| download | pacman-2d32a9a3a348d25d6d0f3d12752399bf7fdf6570.tar.xz | |
Merge branch 'master' of git://projects.archlinux.org/pacman
* 'master' of git://projects.archlinux.org/pacman:
pactree: carry a list of databases for dep resolution
makepkg: Remove a lone quotation mark
makepkg: remove the cleancache option
Don't require a transaction for sync DB updates
Move locking functions to handle
Add a 'valid' flag to the database object
Move database 'version' check to registration time
Do database signature checking at load time
Diffstat (limited to 'lib/libalpm/alpm.c')
| -rw-r--r-- | lib/libalpm/alpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 9b9719d1..b0bbbe8c 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -70,7 +70,7 @@ pmhandle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, snprintf(myhandle->lockfile, lockfilelen, "%s%s", myhandle->dbpath, lf); if(_alpm_db_register_local(myhandle) == NULL) { - myerr = PM_ERR_DB_CREATE; + myerr = myhandle->pm_errno; goto cleanup; } |