Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rock-core/autoproj
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 96717510ac1516c7bfdf2232d7033a94aee42183
Choose a base ref
..
head repository: rock-core/autoproj
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4510c0b99ec486ad378199be99c84f353afd68c3
Choose a head ref
Showing with 4 additions and 2 deletions.
  1. +4 −2 lib/autoproj/ops/configuration.rb
6 changes: 4 additions & 2 deletions lib/autoproj/ops/configuration.rb
Original file line number Diff line number Diff line change
@@ -627,8 +627,10 @@ def update_package_sets(only_local: false,
ws.manifest.register_package_set(pkg_set)
next if pkg_set == root_pkg_set

pkg_set.clean_overrides()
override_priority += 1 if pkg_set.activate_overrides(priority: override_priority)
pkg_set.clean_overrides
if pkg_set.activate_overrides(priority: override_priority)
override_priority += 1
end
end
failures
end