Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-05 17:39:38 -0600
committerDan McGee <dan@archlinux.org>2008-01-05 17:39:38 -0600
commit1a0aaa20df29234250ecc0f9fc3f56bb8cf22ca1 (patch)
treea790c25ec85a4adc1b11cc737eb86e298424673a
parent5aa873edb696bbf678cbb57df43d90e23d562179 (diff)
Don't stat cachedir immediately
By attempting to stat the cachedir when we load the pacman config, pacman bails out if it is a non-existant directory, even if it will never be needed. This is unfortunate as it is only used for sync transactions anyway. Instead, wait until we need it in _alpm_filecache_setup to actually do anything. Reported as FS#9096. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/handle.c8
-rw-r--r--lib/libalpm/util.c3
2 files changed, 3 insertions, 8 deletions
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index 07828115..189c934f 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -362,7 +362,6 @@ int SYMEXPORT alpm_option_set_dbpath(const char *dbpath)
int SYMEXPORT alpm_option_add_cachedir(const char *cachedir)
{
- struct stat st;
char *newcachedir;
size_t cachedirlen;
@@ -372,10 +371,9 @@ int SYMEXPORT alpm_option_add_cachedir(const char *cachedir)
pm_errno = PM_ERR_WRONG_ARGS;
return(-1);
}
- if(stat(cachedir, &st) == -1 || !S_ISDIR(st.st_mode)) {
- pm_errno = PM_ERR_NOT_A_DIR;
- return(-1);
- }
+ /* don't stat the cachedir yet, as it may not even be needed. we can
+ * fail later if it is needed and the path is invalid. */
+
/* verify cachedir ends in a '/' */
cachedirlen = strlen(cachedir);
if(cachedir[cachedirlen-1] != '/') {
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index 851a7c25..64006d1f 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -571,8 +571,6 @@ const char *_alpm_filecache_setup(void)
/* cache directory does not exist.... try creating it */
_alpm_log(PM_LOG_WARNING, _("no %s cache exists, creating...\n"),
cachedir);
- alpm_logaction("warning: no %s cache exists, creating...\n",
- cachedir);
if(_alpm_makepath(cachedir) == 0) {
_alpm_log(PM_LOG_DEBUG, "using cachedir: %s\n", cachedir);
return(cachedir);
@@ -590,7 +588,6 @@ const char *_alpm_filecache_setup(void)
alpm_option_set_cachedirs(tmp);
_alpm_log(PM_LOG_DEBUG, "using cachedir: %s", "/tmp/\n");
_alpm_log(PM_LOG_WARNING, _("couldn't create package cache, using /tmp instead\n"));
- alpm_logaction("warning: couldn't create package cache, using /tmp instead\n");
return(alpm_list_getdata(tmp));
}