MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'tar-rm' into 'master'

Browse Source 
unfetch: Remove source.tar if distclean or no hash

See merge request redox-os/redox!2230
This commit is contained in:
Jeremy Soller 2026-07-13 05:34:08 -06:00
commit 186d9db9e2
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/repo.rs
View File

@ -863,7 +863,7 @@ fn handle_nonstop_fail(recipe: &CookRecipe) -> cookbook::Result<()> {
Ok(())
}
fn handle_clean(recipe: &CookRecipe, _config: &CliConfig, command: &CliCommand) -> Result<bool> {
fn handle_clean(recipe: &CookRecipe, config: &CliConfig, command: &CliCommand) -> Result<bool> {
let mut dir = recipe.dir.join("target");
let mut cached = true;
let unfetch = matches!(*command, CliCommand::Unfetch);
@ -879,10 +879,25 @@ fn handle_clean(recipe: &CookRecipe, _config: &CliConfig, command: &CliCommand)
remove_all(&dir)?;
cached = false;
}
let dir = recipe.dir.join("source");
if dir.exists() && unfetch {
remove_all(&dir)?;
cached = false;
if unfetch {
let dir = recipe.dir.join("source");
if dir.exists() {
remove_all(&dir)?;
cached = false;
}
let tar = recipe.dir.join("source.tar");
// remove tar if there's no blake3 or `make distclean`
if tar.is_file() {
if let Some(SourceRecipe::Tar { blake3, .. }) = &recipe.recipe.source
&& blake3.is_none()
{
remove_all(&tar)?;
cached = false;
} else if config.all {
remove_all(&tar)?;
cached = false;
}
}
}
Ok(cached)
}