diff --git a/src/Composer/Downloader/FileDownloader.php b/src/Composer/Downloader/FileDownloader.php
index 5e508e690..293be3a1d 100644
--- a/src/Composer/Downloader/FileDownloader.php
+++ b/src/Composer/Downloader/FileDownloader.php
@@ -84,7 +84,7 @@ class FileDownloader implements DownloaderInterface
}
if ($output) {
- $this->io->writeError(" - Installing " . $package->getName() . " (" . $package->getFullPrettyVersion() . ")", false);
+ $this->io->writeError(" - Installing " . $package->getName() . " (" . $package->getFullPrettyVersion() . "): ", false);
}
$urls = $package->getDistUrls();
@@ -132,7 +132,6 @@ class FileDownloader implements DownloaderInterface
// download if we don't have it in cache or the cache is invalidated
if (!$this->cache || ($checksum && $checksum !== $this->cache->sha1($cacheKey)) || !$this->cache->copyTo($cacheKey, $fileName)) {
- $this->io->writeError(': ', false);
if (!$this->outputProgress) {
$this->io->writeError('Downloading', false);
}
@@ -163,7 +162,7 @@ class FileDownloader implements DownloaderInterface
$this->cache->copyFrom($cacheKey, $fileName);
}
} else {
- $this->io->writeError(' from cache', false);
+ $this->io->writeError('Loading from cache', false);
}
if (!file_exists($fileName)) {
@@ -211,7 +210,7 @@ class FileDownloader implements DownloaderInterface
$from = $initial->getPrettyVersion();
$to = $target->getPrettyVersion();
- $this->io->writeError(" - Updating " . $name . " (" . $from . " => " . $to . ")", false);
+ $this->io->writeError(" - Updating " . $name . " (" . $from . " => " . $to . "): ", false);
$this->remove($initial, $path, false);
$this->download($target, $path, false);
diff --git a/src/Composer/Downloader/PathDownloader.php b/src/Composer/Downloader/PathDownloader.php
index 6c090a171..3f71b9709 100644
--- a/src/Composer/Downloader/PathDownloader.php
+++ b/src/Composer/Downloader/PathDownloader.php
@@ -140,7 +140,7 @@ class PathDownloader extends FileDownloader implements VcsCapableDownloaderInter
throw new \RuntimeException('Could not reliably remove junction for package ' . $package->getName());
}
} else {
- parent::remove($package, $path);
+ parent::remove($package, $path, $output);
}
}
diff --git a/src/Composer/Util/RemoteFilesystem.php b/src/Composer/Util/RemoteFilesystem.php
index c989315b0..eccf8aa4d 100644
--- a/src/Composer/Util/RemoteFilesystem.php
+++ b/src/Composer/Util/RemoteFilesystem.php
@@ -380,7 +380,7 @@ class RemoteFilesystem
}
if ($this->progress && !$this->retry && !$isRedirect) {
- $this->io->overwriteError("Downloading (".($result === false ? 'failed' : '100%)'), false);
+ $this->io->overwriteError("Downloading (".($result === false ? 'failed' : '100%').")", false);
}
// decode gzip