mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
Merge branch 'no-auto' into 'master'
Remove automatic fetching from change repo local See merge request redox-os/redox!2321
This commit is contained in:
commit
03bc6832c7
@ -1060,7 +1060,6 @@ fn handle_change_rule(
|
||||
CliCommand::ChangeRule | CliCommand::ChangeRuleLocal
|
||||
);
|
||||
let is_capture_rev = matches!(command, CliCommand::CaptureRev);
|
||||
let is_change_rule_local = matches!(command, CliCommand::ChangeRuleLocal);
|
||||
for recipe in recipes {
|
||||
if is_change_rule && recipe.name.is_host() {
|
||||
// host packages will always be "source" so it's pointless to change their rule
|
||||
@ -1118,18 +1117,13 @@ fn handle_change_rule(
|
||||
} else {
|
||||
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
|
||||
fetch_cached = handle_fetch(recipe, config, false, &None)?.cached;
|
||||
}
|
||||
let clean_cached = if !cached && is_change_rule {
|
||||
handle_clean(recipe, config, &CliCommand::Clean)?
|
||||
} else {
|
||||
true
|
||||
};
|
||||
|
||||
if cached && clean_cached && fetch_cached {
|
||||
if cached && clean_cached {
|
||||
print_cached(command, &recipe.name);
|
||||
} else {
|
||||
print_success(command, &recipe.name);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user