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

Fail hard if a package can not be properly removed

pull/531/merge
Jordi Boggiano 2012-04-05 22:58:15 +02:00
parent b141ba4322
commit 9371253e38
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Downloader/FileDownloader.php
View File

@ -101,7 +101,9 @@ class FileDownloader implements DownloaderInterface
*/ */
public function remove(PackageInterface $package, $path) public function remove(PackageInterface $package, $path)
{ {
$this->filesystem->removeDirectory($path); if (!$this->filesystem->removeDirectory($path)) {
throw new \RuntimeException('Could not completely delete '.$path.', aborting.');
}
} }
/** /**

4
src/Composer/Downloader/VcsDownloader.php
View File

@ -77,7 +77,9 @@ abstract class VcsDownloader implements DownloaderInterface
public function remove(PackageInterface $package, $path) public function remove(PackageInterface $package, $path)
{ {
$this->enforceCleanDirectory($path); $this->enforceCleanDirectory($path);
$this->filesystem->removeDirectory($path); if (!$this->filesystem->removeDirectory($path)) {
throw new \RuntimeException('Could not completely delete '.$path.', aborting.');
}
} }
/** /**

2
src/Composer/Util/Filesystem.php
View File

@ -34,7 +34,7 @@ class Filesystem
// clear stat cache because external processes aren't tracked by the php stat cache // clear stat cache because external processes aren't tracked by the php stat cache
clearstatcache(); clearstatcache();
return $result; return $result && !is_dir($directory);
} }
public function ensureDirectoryExists($directory) public function ensureDirectoryExists($directory)