diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-03-04 09:08:54 +0000 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-03-04 09:08:54 +0000 |
| commit | cdb46ef3fa6d2bea95ae45b8b807497982b18fd5 (patch) | |
| tree | 0f2340ed62be9f99f1e4bf0764c65aad1e701964 /lib/libalpm/sync.c | |
| parent | a7d7c963579176dfefe424931a57e86bc8b51924 (diff) | |
| download | 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/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 71925482..337e350a 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -800,8 +800,8 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL); if(stat(ldir, &buf)) { /* no cache directory.... try creating it */ - _alpm_log(PM_LOG_WARNING, _("no %s cache exists. creating...\n"), ldir); - alpm_logaction(_("warning: no %s cache exists. creating..."), ldir); + _alpm_log(PM_LOG_WARNING, _("no %s cache exists, creating...\n"), ldir); + alpm_logaction(_("warning: no %s cache exists, creating..."), ldir); if(_alpm_makepath(ldir)) { /* couldn't mkdir the cache directory, so fall back to /tmp and unlink * the package afterwards. @@ -840,6 +840,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) sha1sum1 = spkg->sha1sum; if((md5sum1 == NULL) && (sha1sum1 == NULL)) { + /* TODO wtf is this? malloc'd strings for error messages? */ if((ptr = (char *)malloc(512)) == NULL) { RET_ERR(PM_ERR_MEMORY, -1); } @@ -848,7 +849,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) retval = 1; continue; } - snprintf(str, PATH_MAX, "%s/%s/%s", handle->root, handle->cachedir, pkgname); + snprintf(str, PATH_MAX, "%s%s%s", handle->root, handle->cachedir, pkgname); md5sum2 = _alpm_MDFile(str); sha1sum2 = _alpm_SHAFile(str); if(md5sum2 == NULL && sha1sum2 == NULL) { @@ -872,7 +873,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) } if(doremove) { char str[PATH_MAX]; - snprintf(str, PATH_MAX, "%s%s/%s", handle->root, handle->cachedir, pkgname); + snprintf(str, PATH_MAX, "%s%s%s", handle->root, handle->cachedir, pkgname); unlink(str); snprintf(ptr, 512, _("archive %s was corrupted (bad MD5 or SHA1 checksum)\n"), pkgname); } else { @@ -957,7 +958,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) char str[PATH_MAX]; fname = alpm_pkg_get_filename(spkg); - snprintf(str, PATH_MAX, "%s%s/%s", handle->root, handle->cachedir, fname); + snprintf(str, PATH_MAX, "%s%s%s", handle->root, handle->cachedir, fname); if(_alpm_trans_addtarget(tr, str) == -1) { goto error; } |