Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-01 21:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: move unpack progress completion after rename and reformat

Browse Source
This commit is contained in:
Aiden McClelland
2026-03-10 00:00:15 -06:00
parent 73c6696873
commit 8dd50eb9c0
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/service/service_map.rs
View File

@@ -299,10 +299,11 @@ impl ServiceMap {
s9pk.serialize(&mut progress_writer, true).await?; s9pk.serialize(&mut progress_writer, true).await?;
let (file, mut unpack_progress) = progress_writer.into_inner(); let (file, mut unpack_progress) = progress_writer.into_inner();
file.sync_all().await?; file.sync_all().await?;
unpack_progress.complete();
crate::util::io::rename(&download_path, &installed_path).await?; crate::util::io::rename(&download_path, &installed_path).await?;
unpack_progress.complete();
Ok::<_, Error>(sync_progress_task) Ok::<_, Error>(sync_progress_task)
}) })
.await?; .await?;
@@ -325,11 +326,8 @@ impl ServiceMap {
.as_manifest() .as_manifest()
.can_migrate_to; .can_migrate_to;
let next_version = &s9pk.as_manifest().version; let next_version = &s9pk.as_manifest().version;
let next_can_migrate_from = let next_can_migrate_from = &s9pk.as_manifest().can_migrate_from;
&s9pk.as_manifest().can_migrate_from; if let Ok(data_ver_ev) = data_ver.parse::<exver::ExtendedVersion>() {
if let Ok(data_ver_ev) =
data_ver.parse::<exver::ExtendedVersion>()
{
if data_ver_ev.satisfies(next_can_migrate_from) { if data_ver_ev.satisfies(next_can_migrate_from) {
ExitParams::target_str(data_ver) ExitParams::target_str(data_ver)
} else if next_version.satisfies(prev_can_migrate_to) { } else if next_version.satisfies(prev_can_migrate_to) {
@@ -340,9 +338,7 @@ impl ServiceMap {
next_can_migrate_from.clone(), next_can_migrate_from.clone(),
)) ))
} }
} else if let Ok(data_ver_range) = } else if let Ok(data_ver_range) = data_ver.parse::<VersionRange>() {
data_ver.parse::<VersionRange>()
{
ExitParams::target_range(&VersionRange::and( ExitParams::target_range(&VersionRange::and(
data_ver_range, data_ver_range,
next_can_migrate_from.clone(), next_can_migrate_from.clone(),
@@ -357,12 +353,7 @@ impl ServiceMap {
} }
} else { } else {
ExitParams::target_version( ExitParams::target_version(
&*service &*service.seed.persistent_container.s9pk.as_manifest().version,
.seed
.persistent_container
.s9pk
.as_manifest()
.version,
) )
}; };
let cleanup = service.uninstall(uninit, false, false).await?; let cleanup = service.uninstall(uninit, false, false).await?;