public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix: use the right directory for repository file

pull/5467/head
bohwaz 2016-06-22 17:19:09 +12:00 committed by bohwaz
parent abcbef4a67
commit 0e26a07a74
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Repository/Vcs/FossilDriver.php
View File

@ -38,15 +38,14 @@ class FossilDriver extends VcsDriver
if (Filesystem::isLocalPath($this->url)) { if (Filesystem::isLocalPath($this->url)) {
$this->checkoutDir = $this->url; $this->checkoutDir = $this->url;
} else { } else {
$cacheDir = $this->config->get('cache-vcs-dir'); $this->repoFile = $this->config->get('cache-repo-dir') . '/' . preg_replace('{[^a-z0-9]}i', '-', $this->url) . '.fossil';
$this->repoFile = $cacheDir . '/' . 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) . '/';
$this->checkoutDir = $cacheDir . '/' . preg_replace('{[^a-z0-9]}i', '-', $this->url) . '/';
$fs = new Filesystem(); $fs = new Filesystem();
$fs->ensureDirectoryExists($cacheDir); $fs->ensureDirectoryExists($this->checkoutDir);
if (!is_writable(dirname($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 // Ensure we are allowed to use this URL by config