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

Merge remote-tracking branch 'vlakoff/clean-backups'

pull/5116/head
Jordi Boggiano 2016-03-26 09:27:44 +00:00
parent 747af10483 93e08fd78e
commit e0fa2ed9c6
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Composer/Command/SelfUpdateCommand.php
View File

@ -105,6 +105,11 @@ EOT
if (Composer::VERSION === $updateVersion) { if (Composer::VERSION === $updateVersion) {
$io->writeError('<info>You are already using composer version '.$updateVersion.'.</info>'); $io->writeError('<info>You are already using composer version '.$updateVersion.'.</info>');
// remove all backups except for the most recent, if any
if ($input->getOption('clean-backups')) {
$this->cleanBackups($rollbackDir, $this->getLastBackupVersion());
}
return 0; return 0;
} }
@ -192,14 +197,7 @@ TAGSPUBKEY
// remove saved installations of composer // remove saved installations of composer
if ($input->getOption('clean-backups')) { if ($input->getOption('clean-backups')) {
$finder = $this->getOldInstallationFinder($rollbackDir); $this->cleanBackups($rollbackDir);
$fs = new Filesystem;
foreach ($finder as $file) {
$file = (string) $file;
$io->writeError('<info>Removing: '.$file.'</info>');
$fs->remove($file);
}
} }
if ($err = $this->setLocalPhar($localFilename, $tempFilename, $backupFile)) { if ($err = $this->setLocalPhar($localFilename, $tempFilename, $backupFile)) {
@ -269,16 +267,15 @@ TAGSPUBKEY
throw new \UnexpectedValueException('Composer rollback failed: no installation to roll back to in "'.$rollbackDir.'"'); throw new \UnexpectedValueException('Composer rollback failed: no installation to roll back to in "'.$rollbackDir.'"');
} }
$old = $rollbackDir . '/' . $rollbackVersion . self::OLD_INSTALL_EXT; $oldFile = $rollbackDir . '/' . $rollbackVersion . self::OLD_INSTALL_EXT;
if (!is_file($old)) { if (!is_file($oldFile)) {
throw new FilesystemException('Composer rollback failed: "'.$old.'" could not be found'); throw new FilesystemException('Composer rollback failed: "'.$oldFile.'" could not be found');
} }
if (!is_readable($old)) { if (!is_readable($oldFile)) {
throw new FilesystemException('Composer rollback failed: "'.$old.'" could not be read'); throw new FilesystemException('Composer rollback failed: "'.$oldFile.'" could not be read');
} }
$oldFile = $rollbackDir . "/{$rollbackVersion}" . self::OLD_INSTALL_EXT;
$io = $this->getIO(); $io = $this->getIO();
$io->writeError(sprintf("Rolling back to version <info>%s</info>.", $rollbackVersion)); $io->writeError(sprintf("Rolling back to version <info>%s</info>.", $rollbackVersion));
if ($err = $this->setLocalPhar($localFilename, $oldFile)) { if ($err = $this->setLocalPhar($localFilename, $oldFile)) {
@ -321,6 +318,22 @@ TAGSPUBKEY
} }
} }
protected function cleanBackups($rollbackDir, $except = null)
{
$finder = $this->getOldInstallationFinder($rollbackDir);
$io = $this->getIO();
$fs = new Filesystem;
foreach ($finder as $file) {
if ($except && $file->getBasename(self::OLD_INSTALL_EXT) === $except) {
continue;
}
$file = (string) $file;
$io->writeError('<info>Removing: '.$file.'</info>');
$fs->remove($file);
}
}
protected function getLastBackupVersion($rollbackDir) protected function getLastBackupVersion($rollbackDir)
{ {
$finder = $this->getOldInstallationFinder($rollbackDir); $finder = $this->getOldInstallationFinder($rollbackDir);