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

Proposed fix for #1675

pull/1678/head
Miklós Márton 2013-03-08 16:06:53 +01:00
parent c54de4b72f
commit 661df121d9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,12 +121,11 @@ class LibraryInstaller implements InstallerInterface
throw new \InvalidArgumentException('Package is not installed: '.$package); throw new \InvalidArgumentException('Package is not installed: '.$package);
} }
$downloadPath = $this->getInstallPath($package);
$this->removeCode($package); $this->removeCode($package);
$this->removeBinaries($package); $this->removeBinaries($package);
$repo->removePackage($package); $repo->removePackage($package);
$downloadPath = $this->getPackageBasePath($package);
if (strpos($package->getName(), '/')) { if (strpos($package->getName(), '/')) {
$packageVendorDir = dirname($downloadPath); $packageVendorDir = dirname($downloadPath);
if (is_dir($packageVendorDir) && !glob($packageVendorDir.'/*')) { if (is_dir($packageVendorDir) && !glob($packageVendorDir.'/*')) {
@ -140,10 +139,14 @@ class LibraryInstaller implements InstallerInterface
*/ */
public function getInstallPath(PackageInterface $package) public function getInstallPath(PackageInterface $package)
{ {
$this->initializeVendorDir();
$targetDir = $package->getTargetDir(); $targetDir = $package->getTargetDir();
return $this->getPackageBasePath($package) . ($targetDir ? '/'.$targetDir : '');
}
return ($this->vendorDir ? $this->vendorDir.'/' : '') . $package->getPrettyName() . ($targetDir ? '/'.$targetDir : ''); protected function getPackageBasePath(PackageInterface $package)
{
$this->initializeVendorDir();
return ($this->vendorDir ? $this->vendorDir.'/' : '') . $package->getPrettyName();
} }
protected function installCode(PackageInterface $package) protected function installCode(PackageInterface $package)
@ -160,7 +163,7 @@ class LibraryInstaller implements InstallerInterface
protected function removeCode(PackageInterface $package) protected function removeCode(PackageInterface $package)
{ {
$downloadPath = $this->getInstallPath($package); $downloadPath = $this->getPackageBasePath($package);
$this->downloadManager->remove($package, $downloadPath); $this->downloadManager->remove($package, $downloadPath);
} }