recovery/command fixes

Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-10-19 17:54:15 -06:00
parent 3cf616e609
commit 38840ff080
3 changed files with 4 additions and 12 deletions

View File

@@ -418,15 +418,9 @@ class SafeUpgradeService
*/
public function clearRecoveryFlag(): void
{
$paths = [
$this->rootPath . '/user/data/recovery.flag',
$this->rootPath . '/user/data/recovery.window',
];
foreach ($paths as $path) {
if (is_file($path)) {
@unlink($path);
}
$flag = $this->rootPath . '/user/data/recovery.flag';
if (is_file($flag)) {
@unlink($flag);
}
}

View File

@@ -235,8 +235,6 @@ class UpdateCommand extends GpmCommand
return 1;
}
$recovery->closeUpgradeWindow();
return 0;
}

View File

@@ -199,7 +199,7 @@ PHP;
$service->clearRecoveryFlag();
self::assertFileDoesNotExist($flag);
self::assertFileDoesNotExist($window);
self::assertFileExists($window);
}
/**