diff --git a/src/Composer/Downloader/ArchiveDownloader.php b/src/Composer/Downloader/ArchiveDownloader.php
index 3c53a086e..96aad4b9a 100644
--- a/src/Composer/Downloader/ArchiveDownloader.php
+++ b/src/Composer/Downloader/ArchiveDownloader.php
@@ -33,16 +33,14 @@ abstract class ArchiveDownloader extends FileDownloader
public function install(PackageInterface $package, $path, $output = true)
{
if ($output) {
- $this->io->writeError(" - Installing " . $package->getName() . " (" . $package->getFullPrettyVersion() . ")");
+ $this->io->writeError(" - Installing " . $package->getName() . " (" . $package->getFullPrettyVersion() . "): Extracting archive");
+ } else {
+ $this->io->writeError('Extracting archive', false);
}
$temporaryDir = $this->config->get('vendor-dir').'/composer/'.substr(md5(uniqid('', true)), 0, 8);
$fileName = $this->getFileName($package, $path);
- if ($output) {
- $this->io->writeError(' Extracting archive', true, IOInterface::VERBOSE);
- }
-
try {
$this->filesystem->ensureDirectoryExists($temporaryDir);
try {
diff --git a/src/Composer/Downloader/PathDownloader.php b/src/Composer/Downloader/PathDownloader.php
index 23c51398e..e289c0173 100644
--- a/src/Composer/Downloader/PathDownloader.php
+++ b/src/Composer/Downloader/PathDownloader.php
@@ -82,6 +82,8 @@ class PathDownloader extends FileDownloader implements VcsCapableDownloaderInter
$package->getName(),
$package->getFullPrettyVersion()
));
+ } else {
+ $this->io->writeError('Source already present', false);
}
return;
@@ -163,7 +165,9 @@ class PathDownloader extends FileDownloader implements VcsCapableDownloaderInter
$fileSystem->mirror($realUrl, $path, $iterator);
}
- $this->io->writeError('');
+ if ($output) {
+ $this->io->writeError('');
+ }
}
/**
@@ -173,7 +177,7 @@ class PathDownloader extends FileDownloader implements VcsCapableDownloaderInter
{
$realUrl = realpath($package->getDistUrl());
- if (realpath($path) === $realUrl) {
+ if ($path === $realUrl) {
if ($output) {
$this->io->writeError(" - Removing " . $package->getName() . " (" . $package->getFullPrettyVersion() . "), source is still present in $path");
}