MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-23 21:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fetch-hang' into 'master'

Browse Source 
Fix hang on fetch

See merge request redox-os/cookbook!684
This commit is contained in:
Jeremy Soller 2025-11-09 06:25:22 -07:00
commit b20cbd0d38
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/repo.rs
View File

@ -293,14 +293,10 @@ fn repo_inner(
app.dump_logs_anyway = true;
let th = thread::spawn(move || {
while let Ok(update) = status_rx.recv() {
let mut should_break = false;
if let StatusUpdate::FlushLog(_p, _q) = &update {
should_break = true;
}
app.update_status(update);
if should_break {
if update == StatusUpdate::CookThreadFinished {
break;
}
app.update_status(update);
}
});
let mut logger = Some((&mut stdout_writer, &mut stderr_writer));
@ -316,6 +312,9 @@ fn repo_inner(
.send(StatusUpdate::FlushLog(recipe.name.clone(), log_path))
.unwrap_or_default();
}
status_tx
.send(StatusUpdate::CookThreadFinished)
.unwrap_or_default();
let _ = th.join();
}
CliCommand::Unfetch => handle_clean(recipe, config, true, true)?,