bin/autoproj in autoproj-1.8.2.b23 vs bin/autoproj in autoproj-1.8.2.b24
- old
+ new
@@ -134,13 +134,15 @@
# package blocks, it is possible that it contains excluded / ignored
# packages
#
# First do the resolution to get auto-add, finalize the package
# configuration, and then re-resolve
- Autoproj::CmdLine.resolve_user_selection(selected_packages)
- # Now load the rest of the configuration, and filter out exclusions
- Autoproj::CmdLine.finalize_package_setup
resolved_selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
+ # Now load the rest of the configuration
+ Autoproj::CmdLine.finalize_package_setup
+ # Finally, filter out exclusions
+ resolved_selected_packages.filter_excluded_and_ignored_packages(Autoproj.manifest)
+
if !selected_packages.empty?
command_line_selection = resolved_selected_packages.dup
else
command_line_selection = Array.new
end