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

Merge branch 'auto-fetch-lc' into 'master'

Browse Source 
Automatically run fetch when make lc.recipe

See merge request redox-os/redox!2191
This commit is contained in:
Jeremy Soller 2026-06-10 09:15:19 -06:00
commit 5c70677c08
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/repo.rs
View File

@ -226,7 +226,7 @@ fn main_inner() -> Result<()> {
} }
let (config, command, recipes) = parse_args(args)?; let (config, command, recipes) = parse_args(args)?;
if command.is_building() { if command.is_building() || matches!(command, CliCommand::ChangeRuleLocal) {
ident::init_ident(); ident::init_ident();
} }
if command == CliCommand::Cook && config.cook.tui { if command == CliCommand::Cook && config.cook.tui {
@ -994,6 +994,7 @@ fn handle_change_rule(
CliCommand::ChangeRule | CliCommand::ChangeRuleLocal CliCommand::ChangeRule | CliCommand::ChangeRuleLocal
); );
let is_capture_rev = matches!(command, CliCommand::CaptureRev); let is_capture_rev = matches!(command, CliCommand::CaptureRev);
let is_change_rule_local = matches!(command, CliCommand::ChangeRuleLocal);
for recipe in recipes { for recipe in recipes {
if is_change_rule && recipe.name.is_host() { if is_change_rule && recipe.name.is_host() {
// host packages will always be "source" so it's pointless to change their rule // host packages will always be "source" so it's pointless to change their rule
@ -1050,13 +1051,23 @@ fn handle_change_rule(
} else { } else {
lock.insert(recipe_name.to_string(), recipe_lock); lock.insert(recipe_name.to_string(), recipe_lock);
} }
let mut fetch_cached = true;
if is_change_rule_local && !recipe.dir.join("source").exists() {
// previously, this is "binary", then user wants to hack around with the source, so we do fetch here
let mut recipe = recipe.clone();
recipe.rule = "source".into();
recipe.reload_recipe()?;
if recipe.recipe.source.is_some() {
fetch_cached = handle_fetch(&recipe, config, false, &None)?.cached;
}
}
let clean_cached = if !cached && is_change_rule { let clean_cached = if !cached && is_change_rule {
handle_clean(recipe, config, &CliCommand::Clean)? handle_clean(recipe, config, &CliCommand::Clean)?
} else { } else {
true true
}; };
if cached && clean_cached { if cached && clean_cached && fetch_cached {
print_cached(command, &recipe.name); print_cached(command, &recipe.name);
} else { } else {
print_success(command, &recipe.name); print_success(command, &recipe.name);