From 0e26a07a7446e0a971183ff3b5935f006f7b16ff Mon Sep 17 00:00:00 2001 From: bohwaz Date: Wed, 22 Jun 2016 17:19:09 +1200 Subject: [PATCH] Fix: use the right directory for repository file --- src/Composer/Repository/Vcs/FossilDriver.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Composer/Repository/Vcs/FossilDriver.php b/src/Composer/Repository/Vcs/FossilDriver.php index d31ef5f9f..11364ea4b 100644 --- a/src/Composer/Repository/Vcs/FossilDriver.php +++ b/src/Composer/Repository/Vcs/FossilDriver.php @@ -38,15 +38,14 @@ class FossilDriver extends VcsDriver if (Filesystem::isLocalPath($this->url)) { $this->checkoutDir = $this->url; } else { - $cacheDir = $this->config->get('cache-vcs-dir'); - $this->repoFile = $cacheDir . '/' . preg_replace('{[^a-z0-9]}i', '-', $this->url) . '.fossil'; - $this->checkoutDir = $cacheDir . '/' . preg_replace('{[^a-z0-9]}i', '-', $this->url) . '/'; + $this->repoFile = $this->config->get('cache-repo-dir') . '/' . preg_replace('{[^a-z0-9]}i', '-', $this->url) . '.fossil'; + $this->checkoutDir = $this->config->get('cache-vcs-dir') . '/' . preg_replace('{[^a-z0-9]}i', '-', $this->url) . '/'; $fs = new Filesystem(); - $fs->ensureDirectoryExists($cacheDir); + $fs->ensureDirectoryExists($this->checkoutDir); if (!is_writable(dirname($this->checkoutDir))) { - throw new \RuntimeException('Can not clone '.$this->url.' to access package information. The "'.$cacheDir.'" directory is not writable by the current user.'); + throw new \RuntimeException('Can not clone '.$this->url.' to access package information. The "'.$this->checkoutDir.'" directory is not writable by the current user.'); } // Ensure we are allowed to use this URL by config