Skip to content

Commit debb33e

Browse files
authored
Remove skip_all_deps and full_rebuild options
See #67 (comment)
1 parent 52c1b49 commit debb33e

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

vinca/main.py

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -676,17 +676,16 @@ def get_selected_packages(distro, vinca_conf):
676676
for i in vinca_conf["packages_select_by_deps"]:
677677
i = i.replace("-", "_")
678678
selected_packages = selected_packages.union([i])
679-
if "skip_all_deps" not in vinca_conf or not vinca_conf["skip_all_deps"]:
680-
if i in skipped_packages:
681-
continue
682-
try:
683-
pkgs = distro.get_depends(i, ignore_pkgs=skipped_packages)
684-
except KeyError:
685-
# handle (rare) package names that use "-" as separator
686-
pkgs = distro.get_depends(i.replace("_", "-"))
687-
selected_packages.remove(i)
688-
selected_packages.add(i.replace("_", "-"))
689-
selected_packages = selected_packages.union(pkgs)
679+
if i in skipped_packages:
680+
continue
681+
try:
682+
pkgs = distro.get_depends(i, ignore_pkgs=skipped_packages)
683+
except KeyError:
684+
# handle (rare) package names that use "-" as separator
685+
pkgs = distro.get_depends(i.replace("_", "-"))
686+
selected_packages.remove(i)
687+
selected_packages.add(i.replace("_", "-"))
688+
selected_packages = selected_packages.union(pkgs)
690689

691690
result = sorted(list(selected_packages))
692691
return result
@@ -976,16 +975,8 @@ def main():
976975
is_built = False
977976
if selected_bn is not None:
978977
pkg_build_number = get_pkg_build_number(selected_bn, pkg["name"], vinca_conf)
979-
if vinca_conf.get("full_rebuild", True):
980-
if pkg["build_number"] == pkg_build_number:
981-
is_built = True
982-
else:
983-
# remove all packages except explicitly selected ones
984-
if (
985-
pkg["name"] not in explicitly_selected_pkgs
986-
or pkg["build_number"] == pkg_build_number
987-
):
988-
is_built = True
978+
if pkg["build_number"] == pkg_build_number:
979+
is_built = True
989980
else:
990981
is_built = True
991982

vinca/migrate.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ def create_migration_instructions(arch, packages_to_migrate, trigger_branch):
113113
print("Final names: ", ros_names)
114114

115115
vinca_conf["packages_select_by_deps"] = ros_names
116-
vinca_conf["skip_all_deps"] = True
117116
vinca_conf["is_migration"] = True
118117
vinca_conf["skip_existing"] = []
119118

0 commit comments

Comments
 (0)