Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master' into feature-dist

  • Loading branch information...
commit 2d9af8c470e6d66f39b7563a7139bb77295aa00c 2 parents 95c203a + ab38ee3
@till till authored
View
2  README.md
@@ -5,7 +5,7 @@ Composer is a package manager tracking local dependencies of your projects and l
See [http://getcomposer.org/](http://getcomposer.org/) for more information and documentation.
-[![Build Status](https://secure.travis-ci.org/composer/composer.png)](http://travis-ci.org/composer/composer)
+[![Build Status](https://secure.travis-ci.org/composer/composer.png?branch=master)](http://travis-ci.org/composer/composer)
Installation / Usage
--------------------
View
2  src/Composer/Installer.php
@@ -240,6 +240,8 @@ protected function doInstall($localRepo, $installedRepo, $aliases, $devMode = fa
$this->package->getDevRequires()
);
+ $this->io->write('<info>Loading composer repositories with package information</info>');
+
// creating repository pool
$pool = new Pool($minimumStability, $stabilityFlags);
$pool->addRepository($installedRepo);
View
20 src/Composer/Installer/LibraryInstaller.php
@@ -175,6 +175,12 @@ protected function installBinaries(PackageInterface $package)
return;
}
foreach ($binaries as $bin) {
+ $binPath = $this->getInstallPath($package).'/'.$bin;
+ if (!file_exists($binPath)) {
+ $this->io->write(' <warning>Skipped installation of '.$bin.' for package '.$package->getName().': file not found in package</warning>');
+ continue;
+ }
+
$this->initializeBinDir();
$link = $this->binDir.'/'.basename($bin);
if (file_exists($link)) {
@@ -184,29 +190,27 @@ protected function installBinaries(PackageInterface $package)
// is a fresh install of the vendor.
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.' for package '.$package->getName().': name conflicts with an existing file');
continue;
}
- $bin = $this->getInstallPath($package).'/'.$bin;
-
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
// add unixy support for cygwin and similar environments
- if ('.bat' !== substr($bin, -4)) {
- file_put_contents($link, $this->generateUnixyProxyCode($bin, $link));
+ if ('.bat' !== substr($binPath, -4)) {
+ file_put_contents($link, $this->generateUnixyProxyCode($binPath, $link));
chmod($link, 0777 & ~umask());
$link .= '.bat';
}
- file_put_contents($link, $this->generateWindowsProxyCode($bin, $link));
+ file_put_contents($link, $this->generateWindowsProxyCode($binPath, $link));
} else {
$cwd = getcwd();
try {
// under linux symlinks are not always supported for example
// when using it in smbfs mounted folder
- $relativeBin = $this->filesystem->findShortestPath($link, $bin);
+ $relativeBin = $this->filesystem->findShortestPath($link, $binPath);
chdir(dirname($link));
symlink($relativeBin, $link);
} catch (\ErrorException $e) {
- file_put_contents($link, $this->generateUnixyProxyCode($bin, $link));
+ file_put_contents($link, $this->generateUnixyProxyCode($binPath, $link));
}
chdir($cwd);
}
View
1  tests/Composer/Test/Fixtures/functional/create-project-command.test
@@ -6,6 +6,7 @@ Installing seld/jsonlint (1.0.0)
Downloading: 100%
Created project in %testDir%
+Loading composer repositories with package information
Installing dependencies
Nothing to install or update
Writing lock file
Please sign in to comment.
Something went wrong with that request. Please try again.