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

Merge pull request #5954 from Golodnyi/master 

Not actual parameters
pull/5636/merge
Jordi Boggiano 2016-12-11 16:16:52 +01:00 committed by GitHub
parent 9d3e3ca486 64f3079c53
commit 9b0ddcd9dd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Command/StatusCommand.php
View File

@ -89,7 +89,7 @@ EOT
$errors[$targetDir] = $targetDir . ' is a symbolic link.'; $errors[$targetDir] = $targetDir . ' is a symbolic link.';
} }
if ($changes = $downloader->getLocalChanges($package, $targetDir, true)) { if ($changes = $downloader->getLocalChanges($package, $targetDir)) {
$errors[$targetDir] = $changes; $errors[$targetDir] = $changes;
} }
} }

2
src/Composer/Downloader/FossilDownloader.php
View File

@ -31,7 +31,7 @@ class FossilDownloader extends VcsDownloader
$url = ProcessExecutor::escape($url); $url = ProcessExecutor::escape($url);
$ref = ProcessExecutor::escape($package->getSourceReference()); $ref = ProcessExecutor::escape($package->getSourceReference());
$repoFile = $path . '.fossil'; $repoFile = $path . '.fossil';
$this->io->writeError(" Cloning ".$package->getSourceReference($repoFile)); $this->io->writeError(" Cloning ".$package->getSourceReference());
$command = sprintf('fossil clone %s %s', $url, ProcessExecutor::escape($repoFile)); $command = sprintf('fossil clone %s %s', $url, ProcessExecutor::escape($repoFile));
if (0 !== $this->process->execute($command, $ignoredOutput)) { if (0 !== $this->process->execute($command, $ignoredOutput)) {
throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput());

4
src/Composer/Repository/Vcs/PerforceDriver.php
View File

@ -38,8 +38,8 @@ class PerforceDriver extends VcsDriver
} }
$this->initPerforce($this->repoConfig); $this->initPerforce($this->repoConfig);
$this->perforce->p4Login($this->io); $this->perforce->p4Login();
$this->perforce->checkStream($this->depot); $this->perforce->checkStream();
$this->perforce->writeP4ClientSpec(); $this->perforce->writeP4ClientSpec();
$this->perforce->connectClient(); $this->perforce->connectClient();