From 10401d544bc536fa15ed88dda7a0c9d161dc24b6 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 9 Dec 2014 11:32:02 +0000 Subject: [PATCH] Avoid leftovers in temp dir --- src/Composer/Package/Archiver/ArchiveManager.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Composer/Package/Archiver/ArchiveManager.php b/src/Composer/Package/Archiver/ArchiveManager.php index 55d87c1a3..d600a7a75 100644 --- a/src/Composer/Package/Archiver/ArchiveManager.php +++ b/src/Composer/Package/Archiver/ArchiveManager.php @@ -137,7 +137,7 @@ class ArchiveManager $sourcePath = realpath('.'); } else { // Directory used to download the sources - $sourcePath = sys_get_temp_dir().'/composer_archiver/arch'.uniqid(); + $sourcePath = sys_get_temp_dir().'/composer_archive'.uniqid(); $filesystem->ensureDirectoryExists($sourcePath); // Download sources @@ -154,7 +154,7 @@ class ArchiveManager } // Create the archive - $tempTarget = sys_get_temp_dir().'/composer_archiver/arch'.uniqid().'.'.$format; + $tempTarget = sys_get_temp_dir().'/composer_archive'.uniqid().'.'.$format; $filesystem->ensureDirectoryExists(dirname($tempTarget)); $archivePath = $usableArchiver->archive($sourcePath, $tempTarget, $format, $package->getArchiveExcludes()); @@ -164,6 +164,7 @@ class ArchiveManager if (!$package instanceof RootPackageInterface) { $filesystem->removeDirectory($sourcePath); } + $filesystem->remove($tempTarget); return $target; }