Skip to content

Commit bcbd1d0

Browse files
committed
improve skipping once more
1 parent e2a99a4 commit bcbd1d0

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

vinca/main.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -885,10 +885,17 @@ def main():
885885

886886
print(f"Selected build number: {selected_bn}")
887887

888+
explicitly_selected_pkgs = [f"ros-{distro}-{pkg.replace('_', '-')}" for pkg in vinca_conf["packages_select_by_deps"]]
889+
888890
for _, pkg in repodata.get("packages").items():
889-
if selected_bn is not None and vinca_conf.get("full_rebuild", True):
890-
if pkg["build_number"] == selected_bn:
891-
skip_built_packages.add(pkg["name"])
891+
if selected_bn is not None:
892+
if vinca_conf.get("full_rebuild", True):
893+
if pkg["build_number"] == selected_bn:
894+
skip_built_packages.add(pkg["name"])
895+
else:
896+
# remove all packages except explicitly selected ones
897+
if pkg["name"] not in explicitly_selected_pkgs and pkg["build_number"] != selected_bn:
898+
skip_built_packages.add(pkg["name"])
892899
else:
893900
skip_built_packages.add(pkg["name"])
894901

0 commit comments

Comments
 (0)