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

Merge pull request #2345 from vuhl/master 

Update to fix issue with multiple perforce repositories
pull/2347/head
Jordi Boggiano 2013-10-17 13:23:05 -07:00
parent 3dd3233e20 0c5f4d9860
commit f1fd9cbd01
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Composer/Downloader/PerforceDownloader.php
View File

@ -45,6 +45,7 @@ class PerforceDownloader extends VcsDownloader
private function initPerforce($package, $path, $ref)
{
if ($this->perforce) {
$this->perforce->initializePath($path);
return;
}

11
src/Composer/Util/Perforce.php
View File

@ -38,9 +38,7 @@ class Perforce
{
$this->windowsFlag = $isWindows;
$this->p4Port = $port;
$this->path = $path;
$fs = new Filesystem();
$fs->ensureDirectoryExists($path);
$this->initializePath($path);
$this->process = $process;
$this->initialize($repoConfig);
}
@ -131,6 +129,13 @@ class Perforce
return $this->path;
}
public function initializePath($path)
{
$this->path = $path;
$fs = new Filesystem();
$fs->ensureDirectoryExists($path);
}
protected function getPort()
{
return $this->p4Port;