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

fix #6244

pull/6260/head
David Zuelke 2017-03-14 16:59:39 +01:00
parent 2e9dbb79ef
commit f20d40a33a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Downloader/ArchiveDownloader.php
View File

@ -91,10 +91,6 @@ abstract class ArchiveDownloader extends FileDownloader
break; break;
} }
if ($output) {
$this->io->writeError('');
}
} }
/** /**

5
src/Composer/Downloader/FileDownloader.php
View File

@ -90,7 +90,8 @@ class FileDownloader implements DownloaderInterface
$urls = $package->getDistUrls(); $urls = $package->getDistUrls();
while ($url = array_shift($urls)) { while ($url = array_shift($urls)) {
try { try {
return $this->doDownload($package, $path, $url); $fileName = $this->doDownload($package, $path, $url);
break;
} catch (\Exception $e) { } catch (\Exception $e) {
if ($this->io->isDebug()) { if ($this->io->isDebug()) {
$this->io->writeError(''); $this->io->writeError('');
@ -109,6 +110,8 @@ class FileDownloader implements DownloaderInterface
if ($output) { if ($output) {
$this->io->writeError(''); $this->io->writeError('');
} }
return $fileName;
} }
protected function doDownload(PackageInterface $package, $path, $url) protected function doDownload(PackageInterface $package, $path, $url)