admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo (#845)

Browse Source
This commit is contained in:
Macavirus
2022-01-27 03:21:35 +07:00
committed by GitHub
parent 0525e5aac3
commit 6b09212814
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/steps/os/archlinux.rs
View File

@@ -150,7 +150,7 @@ impl Pacman {
} }
} }
fn box_pacakge_manager<P: 'static + ArchPackageManager>(package_manager: P) -> Box<dyn ArchPackageManager> { fn box_package_manager<P: 'static + ArchPackageManager>(package_manager: P) -> Box<dyn ArchPackageManager> {
Box::new(package_manager) as Box<dyn ArchPackageManager> Box::new(package_manager) as Box<dyn ArchPackageManager>
} }
@@ -159,17 +159,17 @@ pub fn get_arch_package_manager(ctx: &ExecutionContext) -> Option<Box<dyn ArchPa
match ctx.config().arch_package_manager() { match ctx.config().arch_package_manager() {
config::ArchPackageManager::Autodetect => YayParu::get("paru", &pacman) config::ArchPackageManager::Autodetect => YayParu::get("paru", &pacman)
.map(box_pacakge_manager) .map(box_package_manager)
.or_else(|| YayParu::get("yay", &pacman).map(box_pacakge_manager)) .or_else(|| YayParu::get("yay", &pacman).map(box_package_manager))
.or_else(|| { .or_else(|| {
Trizen::get() Trizen::get()
.map(box_pacakge_manager) .map(box_package_manager)
.or_else(|| Pacman::get(ctx).map(box_pacakge_manager)) .or_else(|| Pacman::get(ctx).map(box_package_manager))
}), }),
config::ArchPackageManager::Trizen => Trizen::get().map(box_pacakge_manager), config::ArchPackageManager::Trizen => Trizen::get().map(box_package_manager),
config::ArchPackageManager::Paru => YayParu::get("paru", &pacman).map(box_pacakge_manager), config::ArchPackageManager::Paru => YayParu::get("paru", &pacman).map(box_package_manager),
config::ArchPackageManager::Yay => YayParu::get("yay", &pacman).map(box_pacakge_manager), config::ArchPackageManager::Yay => YayParu::get("yay", &pacman).map(box_package_manager),
config::ArchPackageManager::Pacman => Pacman::get(ctx).map(box_pacakge_manager), config::ArchPackageManager::Pacman => Pacman::get(ctx).map(box_package_manager),
} }
} }