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

Mark failed downloads as failed instead of 100% complete, fixes #5111

pull/5124/head
Jordi Boggiano 2016-03-27 17:14:51 +01:00
parent 7595734df0
commit 37a1e12672
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Util/RemoteFilesystem.php
View File

@ -342,6 +342,10 @@ class RemoteFilesystem
// fail 4xx and 5xx responses and capture the response // fail 4xx and 5xx responses and capture the response
if ($statusCode && $statusCode >= 400 && $statusCode <= 599) { if ($statusCode && $statusCode >= 400 && $statusCode <= 599) {
if (!$this->retry) { if (!$this->retry) {
if ($this->progress && !$this->retry && !$isRedirect) {
$this->io->overwriteError(" Downloading: <error>Failed</error>");
}
$e = new TransportException('The "'.$this->fileUrl.'" file could not be downloaded ('.$http_response_header[0].')', $statusCode); $e = new TransportException('The "'.$this->fileUrl.'" file could not be downloaded ('.$http_response_header[0].')', $statusCode);
$e->setHeaders($http_response_header); $e->setHeaders($http_response_header);
$e->setResponse($result); $e->setResponse($result);
@ -352,7 +356,7 @@ class RemoteFilesystem
} }
if ($this->progress && !$this->retry && !$isRedirect) { if ($this->progress && !$this->retry && !$isRedirect) {
$this->io->overwriteError(" Downloading: <comment>100%</comment>"); $this->io->overwriteError(" Downloading: ".($result === false ? '<error>Failed</error>' : '<comment>100%</comment>'));
} }
// decode gzip // decode gzip