Skip to content

Ensure upgrade targets do not expand beyond installed packages #1019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
razor-x wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Ensure upgrade targets do not expand beyond installed packages #1019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion rust/aura-pm/src/command/aur.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,7 @@ pub(crate) fn upgrade<'a>(
})
.filter(|p| env.aur.ignores.contains(p.name.as_ref()).not())
.collect();
let eligible_names: HashSet<_> = filtered.iter().map(|p| p.name.as_ref()).collect();
debug!("After excluding ignores and debugs: {}", filtered.len());

// --- Ensure they all have local clones --- //
Expand Down Expand Up @@ -675,6 +676,7 @@ pub(crate) fn upgrade<'a>(
let db = alpm.alpm.localdb();
let mut to_upgrade: Vec<(aura_core::Package<'_>, aura_core::Package<'_>)> = from_api
.into_iter()
.filter(|new| eligible_names.contains(new.name.as_str()))
.filter_map(|new| db.pkg(new.name.as_str()).ok().map(|old| (old, new)))
.filter_map(
|(old, new)| match (Package::from_alpm(old), Package::from_faur(new)) {
Expand Down Expand Up @@ -750,7 +752,8 @@ pub(crate) fn upgrade<'a>(
let names = to_upgrade
.iter()
.map(|(old, _)| old.name.as_ref())
.chain(vcs.iter().map(|p| p.name.as_ref()));
.chain(vcs.iter().map(|p| p.name.as_ref()))
.filter(|name| eligible_names.contains(*name));

install(fll, &env, Mode::Upgrade, names)?;
}
Expand Down
Loading