Fix yay -Sc wiping ~/.cache/yay on 3rd question. #2175
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Should the fix not be setting the In this case if the user does not have remote packages it will always be recomputed |
If you answer yes to
:: Do you want to remove all other AUR packages from cache? [Y/n]
then we run cleanAUR(), intending to remove subdirectories of
~/.cache/yay that do not share a name with installed packages not
found in the sync repositories.
Where this was going wrong was cleanAUR() was getting an empty map from
dbExecutor.InstalledRemotePackages()---because InstalledRemotePackages
only recomputes its result if installedRemotePkgMap is nil, whereas
NewExecutor initialized it to an empty map. The symptom was it emptied
my ~/.cache/yay.
We do want a non-nil, empty installedRemotePkgMap to block recomputing
(that is, to indicate the user really has no remote packages), so now
NewExecutor initializes it to nil, and getPackageNamesBySource is
responsible for making sure it's non-nil before writing to it.
Fixes Jguer#2152, which seems to have been introduced in
4626a04.
|
Oh, yes, that would be better. Updated! |
|
Thanks for the PR and the fix @pteromys 😃 , I'm merging it as soon as it passes the CI |
Jguer
approved these changes
May 22, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If you answer yes to
then we run
cleanAUR(), intending to remove subdirectories of~/.cache/yaythat do not share a name with installed packages not found in the sync repositories.Where this was going wrong was
cleanAUR's invocation was getting an empty map fromdbExecutor.InstalledRemotePackages()—becauseInstalledRemotePackagesonly recomputed its result ifinstalledRemotePkgMapwasnilwhereasNewExecutorinitialized it to an empty map. The symptom was it emptied my~/.cache/yay.We do want a non-nil, empty
installedRemotePkgMapto block recomputing (that is, to indicate the user really has no remote packages), so nowNewExecutorinitializes it to nil, andgetPackageNamesBySourceis responsible for making sure it's non-nil before writing to it.Fixes #2152, which seems to have been introduced in 4626a04.