From 9cbfe319834bb8b1e481ca00fe012c4bcf01da64 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 3 Jul 2013 01:05:54 +0200 Subject: [PATCH] Fix regression when using -vvv --- src/Composer/Downloader/FileDownloader.php | 4 +++- src/Composer/Downloader/VcsDownloader.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php index 07a768985..28dd2d779 100644 --- a/src/Composer/Downloader/FileDownloader.php +++ b/src/Composer/Downloader/FileDownloader.php @@ -97,7 +97,9 @@ class FileDownloader implements DownloaderInterface } elseif (count($urls)) { $this->io->write(''); $this->io->write(' Failed, trying the next URL'); - } else { + } + + if (!count($urls)) { throw $e; } } diff --git a/src/Composer/Downloader/VcsDownloader.php b/src/Composer/Downloader/VcsDownloader.php index 7ebadf51c..bff9201f7 100644 --- a/src/Composer/Downloader/VcsDownloader.php +++ b/src/Composer/Downloader/VcsDownloader.php @@ -67,7 +67,8 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa $this->io->write('Failed: ['.get_class($e).'] '.$e->getMessage()); } elseif (count($urls)) { $this->io->write(' Failed, trying the next URL'); - } else { + } + if (!count($urls)) { throw $e; } }