diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-03-04 10:08:54 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-03-04 10:08:54 +0100 |
| commit | cdb46ef3fa6d2bea95ae45b8b807497982b18fd5 (patch) | |
| tree | 0f2340ed62be9f99f1e4bf0764c65aad1e701964 /lib/libalpm/alpm.c | |
| parent | a7d7c963579176dfefe424931a57e86bc8b51924 (diff) | |
| download | pacman-cdb46ef3fa6d2bea95ae45b8b807497982b18fd5.tar.gz pacman-cdb46ef3fa6d2bea95ae45b8b807497982b18fd5.tar.xz | |
* Fixed a whole mess of extra '/' pathing issues when a different root is
specified
* Use db->path when appropriate
* Commented out the FAKEROOT checks in libalpm. This should never ever be done.
TODO test this quite a bit, as this will never cause the transactions to fail
if RW operations are requested... right now it is totally up to the front end
to decide when to fail
* Use realpath() to canonicalize the root path when specified, so
_alpm_makepath() doesn't freak out
* Fixed some output/indent of MDFile and SHAFile algorithms
* More efficient sprintf() usage in MDFile/SHAFile
* Added real error output to _alpm_makepath
Diffstat (limited to 'lib/libalpm/alpm.c')
| -rw-r--r-- | lib/libalpm/alpm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 96ad3416..733a4360 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -299,10 +299,10 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) _alpm_log(PM_LOG_DEBUG, _("sync: new mtime for %s: %s"), db->treename, newmtime); _alpm_db_setlastupdate(db, newmtime); } - snprintf(path, PATH_MAX, "%s%s/%s" PM_EXT_DB, handle->root, handle->dbpath, db->treename); + snprintf(path, PATH_MAX, "%s%s%s" PM_EXT_DB, handle->root, handle->dbpath, db->treename); /* remove the old dir */ - _alpm_log(PM_LOG_DEBUG, _("flushing database %s%s"), handle->dbpath, db->treename); + _alpm_log(PM_LOG_DEBUG, _("flushing database %s%s"), db->path); for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) { pmpkg_t *pkg = lp->data; if(pkg && _alpm_db_remove(db, pkg) == -1) { |