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

Merge pull request #2891 from igorw/skip-bin-log-msg 

Clarify log messages when skipping existing bins
pull/2321/merge
Jordi Boggiano 2014-04-09 13:49:44 +02:00
parent 1efa02a7ab c0086ba1e3
commit b7f45b688d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Installer/LibraryInstaller.php
View File

@ -196,7 +196,7 @@ class LibraryInstaller implements InstallerInterface
foreach ($binaries as $bin) { foreach ($binaries as $bin) {
$binPath = $this->getInstallPath($package).'/'.$bin; $binPath = $this->getInstallPath($package).'/'.$bin;
if (!file_exists($binPath)) { if (!file_exists($binPath)) {
$this->io->write(' <warning>Skipped installation of '.$bin.' for package '.$package->getName().': file not found in package</warning>'); $this->io->write(' <warning>Skipped installation of bin '.$bin.' for package '.$package->getName().': file not found in package</warning>');
continue; continue;
} }
@ -215,7 +215,7 @@ class LibraryInstaller implements InstallerInterface
// is a fresh install of the vendor. // is a fresh install of the vendor.
@chmod($link, 0777 & ~umask()); @chmod($link, 0777 & ~umask());
} }
$this->io->write(' Skipped installation of '.$bin.' for package '.$package->getName().': name conflicts with an existing file'); $this->io->write(' Skipped installation of bin '.$bin.' for package '.$package->getName().': name conflicts with an existing file');
continue; continue;
} }
if (defined('PHP_WINDOWS_VERSION_BUILD')) { if (defined('PHP_WINDOWS_VERSION_BUILD')) {
@ -225,7 +225,7 @@ class LibraryInstaller implements InstallerInterface
@chmod($link, 0777 & ~umask()); @chmod($link, 0777 & ~umask());
$link .= '.bat'; $link .= '.bat';
if (file_exists($link)) { if (file_exists($link)) {
$this->io->write(' Skipped installation of '.$bin.'.bat proxy for package '.$package->getName().': a .bat proxy was already installed'); $this->io->write(' Skipped installation of bin '.$bin.'.bat proxy for package '.$package->getName().': a .bat proxy was already installed');
} }
} }
if (!file_exists($link)) { if (!file_exists($link)) {