Revert first-time patching logic

Signed-off-by: Miaha Cybersec <[email protected]>
project-copacetic · Jul 30, 2024 · a01880e · a01880e
1 parent 21d48d5
commit a01880e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/pkgmgr/apk.go b/pkg/pkgmgr/apk.go
@@ -235,7 +235,7 @@ func (am *apkManager) upgradePackages(ctx context.Context, updates unversioned.U
 	}
 
 	// Diff the installed updates and merge that into the target image
-	patchDiff := llb.Diff(am.config.ImageState, apkInstalled)
+	patchDiff := llb.Diff(apkUpdated, apkInstalled)
 	patchMerge := llb.Merge([]llb.State{am.config.ImageState, patchDiff})
 
 	return &patchMerge, resultManifestBytes, nil

diff --git a/pkg/pkgmgr/dpkg.go b/pkg/pkgmgr/dpkg.go
@@ -376,7 +376,7 @@ func (dm *dpkgManager) installUpdates(ctx context.Context, updates unversioned.U
 	}
 
 	// Diff the installed updates and merge that into the target image
-	patchDiff := llb.Diff(dm.config.ImageState, aptInstalled)
+	patchDiff := llb.Diff(aptUpdated, aptInstalled)
 	patchMerge := llb.Merge([]llb.State{dm.config.ImageState, patchDiff})
 
 	return &patchMerge, resultsBytes, nil