lib/autoproj/cli/update.rb in autoproj-2.0.0.b1 vs lib/autoproj/cli/update.rb in autoproj-2.0.0.b2
- old
+ new
@@ -30,16 +30,19 @@
def run(selected_packages, options)
selected_packages, config_selected =
normalize_command_line_package_selection(selected_packages)
+ if options[:apply_post_install].nil?
+ options[:apply_post_install] = true
+ end
+
if options[:config].nil?
options[:config] = selected_packages.empty? || config_selected
end
ws.setup
- ws.install_ruby_shims
# Do that AFTER we have properly setup ws.osdeps as to avoid
# unnecessarily redetecting the operating system
if options[:osdeps]
ws.config.set(
@@ -110,18 +113,20 @@
reset: options[:reset],
recursive: options[:deps],
ignore_errors: options[:keep_going])
ws.finalize_setup
- load_all_available_package_manifests
+ if options[:apply_post_install]
+ ws.apply_post_install
+ end
ws.export_installation_manifest
if options[:osdeps] && !osdep_packages.empty?
ws.osdeps.install(osdep_packages, osdeps_options)
end
- ws.env.export_env_sh
- Autoproj.message "autoproj: updated #{ws.root_dir}/#{Autoproj::ENV_FILENAME}", :green
+ ws.export_env_sh(source_packages)
+ Autoproj.message " updated #{ws.root_dir}/#{Autoproj::ENV_FILENAME}", :green
return command_line_selection, source_packages, osdep_packages
end
def load_all_available_package_manifests