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

Make zypper dist-upgrade opt-in on SLE/Leap (#417)

Browse Source 
Make zypper dist-upgrade opt-in on SLE/Leap

- Create a `suse_dup` config option
- Create a new `Distribution::OpenSuseTumbleweed` object along with `upgrade_opensuse_tumbleweed()`
    * The purpose of it is to ignore the config option on Tumblweed as
      zypper `dup` is the only way to update a Tumbleweed
This commit is contained in:
signed-log
2023-05-05 08:24:01 +00:00
committed by GitHub
parent f30e36d7bb
commit 97fd2b2718
3 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@ pub enum Distribution {
Debian,
Gentoo,
OpenMandriva,
OpenSuseTumbleweed,
PCLinuxOS,
Suse,
SuseMicro,
@@ -81,7 +82,12 @@ impl Distribution {
} else if id_like.contains(&"centos") {
return Ok(Distribution::CentOS);
} else if id_like.contains(&"suse") {
return Ok(Distribution::Suse);
let id_variant = id.unwrap_or_default();
if id_variant.contains("tumbleweed") {
return Ok(Distribution::OpenSuseTumbleweed);
} else {
return Ok(Distribution::Suse);
}
} else if id_like.contains(&"arch") || id_like.contains(&"archlinux") {
return Ok(Distribution::Arch);
} else if id_like.contains(&"alpine") {
@@ -122,6 +128,7 @@ impl Distribution {
Distribution::Gentoo => upgrade_gentoo(ctx),
Distribution::Suse => upgrade_suse(ctx),
Distribution::SuseMicro => upgrade_suse_micro(ctx),
Distribution::OpenSuseTumbleweed => upgrade_opensuse_tumbleweed(ctx),
Distribution::Void => upgrade_void(ctx),
Distribution::Solus => upgrade_solus(ctx),
Distribution::Exherbo => upgrade_exherbo(ctx),
@@ -243,7 +250,12 @@ fn upgrade_suse(ctx: &ExecutionContext) -> Result<()> {
ctx.run_type()
.execute(sudo)
.args(["zypper", "dist-upgrade"])
.arg("zypper")
.arg(if ctx.config().suse_dup() {
"dist-upgrade"
} else {
"update"
})
.status_checked()?;
} else {
print_warning("No sudo detected. Skipping system upgrade");
@@ -251,6 +263,26 @@ fn upgrade_suse(ctx: &ExecutionContext) -> Result<()> {
Ok(())
}
fn upgrade_opensuse_tumbleweed(ctx: &ExecutionContext) -> Result<()> {
if let Some(sudo) = ctx.sudo() {
ctx.run_type()
.execute(sudo)
.args(["zypper", "refresh"])
.status_checked()?;
ctx.run_type()
.execute(sudo)
.arg("zypper")
.arg("dist-upgrade")
.status_checked()?;
} else {
print_warning("No sudo detected. Skipping system upgrade");
}
Ok(())
}
fn upgrade_suse_micro(ctx: &ExecutionContext) -> Result<()> {
if let Some(sudo) = ctx.sudo() {
ctx.run_type()