kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-12 13:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't drop packages that would be re-installed during upgrade

Browse Source 
Check for packages that are marked for deletion. If the ones that are
marked for install are depending on it, don't remove them at all
This commit is contained in:
Ettore Di Giacinto
2020-05-20 22:46:47 +02:00
parent 916b2a8927
commit ab179db96a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/solver/solver.go
View File

@@ -277,8 +277,10 @@ func (s *Solver) Upgrade(checkconflicts bool) (pkg.Packages, PackagesAssertions,
}
}
}
s2 := NewSolver(installedcopy, s.DefinitionDatabase, pkg.NewInMemoryDatabase(false))
s2.SetResolver(s.Resolver)
// Then try to uninstall the versions in the system, and store that tree
for _, p := range toUninstall {
r, err := s.Uninstall(p, checkconflicts, false)
@@ -286,13 +288,15 @@ func (s *Solver) Upgrade(checkconflicts bool) (pkg.Packages, PackagesAssertions,
return nil, nil, errors.Wrap(err, "Could not compute upgrade - couldn't uninstall selected candidate "+p.GetFingerPrint())
}
for _, z := range r {
err = installedcopy.RemovePackage(z)
if err != nil {
return nil, nil, errors.Wrap(err, "Could not compute upgrade - couldn't remove copy of package targetted for removal")
if conflicts, err := s2.Conflicts(z, toInstall); !conflicts {
err = installedcopy.RemovePackage(z)
if err != nil {
return nil, nil, errors.Wrap(err, "Could not compute upgrade - couldn't remove copy of package targetted for removal")
}
}
}
}
r, e := s2.Install(toInstall)
return toUninstall, r, e
// To that tree, ask to install the versions that should be upgraded, and try to solve