Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-01 18:11:25 +01:00
Code Issues Packages Projects Releases Activity

don’t copy non-upgrade root folders

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-11-05 21:23:11 +00:00
parent 70a2e668ec
commit 042b845b8d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
system/src/Grav/Common/Upgrade/SafeUpgradeService.php
View File

@@ -206,13 +206,13 @@ class SafeUpgradeService
$this->hydrateIgnoredDirectories($packagePath, $ignores);
$this->carryOverRootFiles($packagePath, $ignores);
$snapshotEntries = $this->collectPackageEntries($packagePath);
// IMPORTANT: Snapshot should ONLY include files from the original package, NOT custom directories
// that were carried over. This prevents snapshotting huge custom folders like /media-test, /downloads, etc.
// The carryOverRootFiles() method preserves custom files during upgrade, but they should not be snapshotted
// because they are not being replaced and don't need to be rolled back.
if (!$packageEntries) {
throw new RuntimeException('Staged package does not contain any files to promote.');
}
if (!$snapshotEntries) {
$snapshotEntries = $packageEntries;
}
// FINAL SAFETY CHECK: Verify 'user' is not in the entries that will be deployed
if (in_array('user', $packageEntries, true)) {
@@ -223,9 +223,9 @@ class SafeUpgradeService
}
$this->reportProgress('snapshot', 'Creating backup snapshot...', null);
$this->createBackupSnapshot($snapshotEntries, $backupPath);
$this->createBackupSnapshot($packageEntries, $backupPath);
$manifest = $this->buildManifest($stageId, $targetVersion, $packagePath, $backupPath, $snapshotEntries);
$manifest = $this->buildManifest($stageId, $targetVersion, $packagePath, $backupPath, $packageEntries);
$manifestPath = $stagePath . DIRECTORY_SEPARATOR . 'manifest.json';
Folder::create(dirname($manifestPath));
file_put_contents($manifestPath, json_encode($manifest, JSON_PRETTY_PRINT));