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

Fixes paru/yay -Pw return code error (#228)

Browse Source
This commit is contained in:
Thomas Schönauer
2022-11-29 06:49:26 +00:00
committed by GitHub
parent 70045fca29
commit 22ab07d88e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/executor.rs
View File

@@ -176,7 +176,7 @@ impl Executor {
/// An extension of `status_checked` that allows you to set a sequence of codes /// An extension of `status_checked` that allows you to set a sequence of codes
/// that can indicate success of a script /// that can indicate success of a script
#[cfg_attr(windows, allow(dead_code))] #[allow(dead_code)]
pub fn status_checked_with_codes(&mut self, codes: &[i32]) -> Result<()> { pub fn status_checked_with_codes(&mut self, codes: &[i32]) -> Result<()> {
match self { match self {
Executor::Wet(c) => c.status_checked_with(|status| { Executor::Wet(c) => c.status_checked_with(|status| {

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

@@ -1,7 +1,6 @@
use std::env::var_os; use std::env::var_os;
use std::ffi::OsString; use std::ffi::OsString;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::Command;
use color_eyre::eyre; use color_eyre::eyre;
use color_eyre::eyre::Result; use color_eyre::eyre::Result;
@@ -32,7 +31,10 @@ pub struct YayParu {
impl ArchPackageManager for YayParu { impl ArchPackageManager for YayParu {
fn upgrade(&self, ctx: &ExecutionContext) -> Result<()> { fn upgrade(&self, ctx: &ExecutionContext) -> Result<()> {
if ctx.config().show_arch_news() { if ctx.config().show_arch_news() {
Command::new(&self.executable).arg("-Pw").status_checked()?; ctx.run_type()
.execute(&self.executable)
.arg("-Pw")
.status_checked_with_codes(&[1, 0])?;
} }
let mut command = ctx.run_type().execute(&self.executable); let mut command = ctx.run_type().execute(&self.executable);