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

Don't require sudo for ostree (fix #479) (#480)

Browse Source
This commit is contained in:
Roey Darwish Dror
2020-07-21 10:05:57 +03:00
committed by GitHub
parent e3d2d11e8a
commit b77bbf57dd
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,14 +227,24 @@ fn upgrade_arch_linux(ctx: &ExecutionContext) -> Result<()> {
} }
fn upgrade_redhat(ctx: &ExecutionContext) -> Result<()> { fn upgrade_redhat(ctx: &ExecutionContext) -> Result<()> {
if let Some(ostree) = Path::new("/usr/bin/rpm-ostree").if_exists() {
let mut command = ctx.run_type().execute(ostree);
command.arg("upgrade");
if ctx.config().yes() {
command.arg("-y");
}
return command.check_run();
}
if let Some(sudo) = &ctx.sudo() { if let Some(sudo) = &ctx.sudo() {
let mut command = ctx.run_type().execute(&sudo); let mut command = ctx.run_type().execute(&sudo);
command command
.arg(Path::new("/usr/bin/dnf").if_exists().unwrap_or_else(|| { .arg(
Path::new("/usr/bin/yum") Path::new("/usr/bin/dnf")
.if_exists() .if_exists()
.unwrap_or_else(|| Path::new("/usr/bin/rpm-ostree")) .unwrap_or_else(|| Path::new("/usr/bin/yum")),
})) )
.arg("upgrade"); .arg("upgrade");
if let Some(args) = ctx.config().dnf_arguments() { if let Some(args) = ctx.config().dnf_arguments() {