MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-07-10 05:28:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix push command not respecting ignore rule

Browse Source
This commit is contained in:
Wildan M 2026-05-08 21:18:15 +07:00
parent 0801c2cc82
commit 0ce39682c5
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
2 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/repo.mk
View File

@ -124,7 +124,7 @@ endif
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@ ALLOW_FSTOOLS=$(FSTOOLS_IN_PODMAN) $(PODMAN_RUN) make $@ ALLOW_FSTOOLS=$(FSTOOLS_IN_PODMAN)
else else
$(REPO_BIN) push $(foreach f,$(subst $(comma), ,$*),$(f)) "--sysroot=$(MOUNT_DIR)" $(REPO_BIN) push $(foreach f,$(subst $(comma), ,$*),$(f)) "--sysroot=$(MOUNT_DIR)" $(COOKBOOK_OPTS)
endif endif
ifeq ($(ALLOW_FSTOOLS),1) ifeq ($(ALLOW_FSTOOLS),1)
@if [ -f $(MOUNTED_TAG) ]; then \ @if [ -f $(MOUNTED_TAG) ]; then \

46
src/bin/repo.rs
View File

@ -567,7 +567,7 @@ fn parse_args(args: Vec<String>) -> Result<(CliConfig, CliCommand, Vec<CookRecip
let lock = &get_config().recipe_lock; let lock = &get_config().recipe_lock;
let mut recipes = if let Some(conf) = config.filesystem.as_ref() { let mut recipes = {
let repo_binary = override_filesystem_repo_binary; let repo_binary = override_filesystem_repo_binary;
// Expand deps for "source" + "local" and "binary" // Expand deps for "source" + "local" and "binary"
@ -585,24 +585,26 @@ fn parse_args(args: Vec<String>) -> Result<(CliConfig, CliCommand, Vec<CookRecip
special_rules.insert(recipe_name.clone(), rule.to_string()); special_rules.insert(recipe_name.clone(), rule.to_string());
// lock rules does not recurse as it's done already in the file // lock rules does not recurse as it's done already in the file
} }
for (recipe_name_str, recipe_config) in conf.packages.iter() { if let Some(conf) = config.filesystem.as_ref() {
let Ok(recipe_name) = PackageName::new(recipe_name_str) else { for (recipe_name_str, recipe_config) in conf.packages.iter() {
continue; let Ok(recipe_name) = PackageName::new(recipe_name_str) else {
}; continue;
};
let rule = if let Some(rule) = special_rules.get(&recipe_name) { let rule = if let Some(rule) = special_rules.get(&recipe_name) {
rule.as_str() rule.as_str()
} else if let PackageConfig::Build(rule) = recipe_config { } else if let PackageConfig::Build(rule) = recipe_config {
special_rules.insert(recipe_name.clone(), rule.to_string()); special_rules.insert(recipe_name.clone(), rule.to_string());
rule rule
} else { } else {
default_rule default_rule
}; };
if rule == "source" || rule == "local" { if rule == "source" || rule == "local" {
source_names.push(recipe_name); source_names.push(recipe_name);
} else if rule == "binary" { } else if rule == "binary" {
binary_names.push(recipe_name); binary_names.push(recipe_name);
}
} }
} }
source_names = CookRecipe::get_all_deps_names_recursive(&source_names, true)?; source_names = CookRecipe::get_all_deps_names_recursive(&source_names, true)?;
@ -706,16 +708,6 @@ fn parse_args(args: Vec<String>) -> Result<(CliConfig, CliCommand, Vec<CookRecip
} }
recipes recipes
} else {
if config.with_package_deps || command.is_pushing() {
recipe_names = CookRecipe::get_package_deps_recursive(&recipe_names, true)?;
}
if command.is_building() || command.is_pushing() {
let include_dev = command.is_building();
CookRecipe::get_build_deps_recursive(&recipe_names, include_dev)?
} else {
CookRecipe::from_list(recipe_names.clone())?
}
}; };
if !get_config().recipe_lock.is_empty() { if !get_config().recipe_lock.is_empty() {