lib/autoproj/cli/update.rb in autoproj-2.0.0.rc37 vs lib/autoproj/cli/update.rb in autoproj-2.0.0.rc38

@@ -11,11 +11,11 @@
                 if !options[:osdeps]
                     options[:osdeps_mode] = Array.new
                 end
 
                 if from = options[:from]
-                    options[:from] = Autoproj::InstallationManifest.from_root(options[:from])
+                    options[:from] = Autoproj::InstallationManifest.from_workspace_root(options[:from])
                 end
                 ws.os_package_installer.filter_uptodate_packages = options[:osdeps_filter_uptodate]
 
                 if options[:aup] && !options[:all] && packages.empty?
                     packages = ['.']
@@ -107,41 +107,27 @@
                 osdeps_options = Hash[install_only: options[:checkout_only]]
                 if options[:osdeps_mode]
                     osdeps_options[:osdeps_mode] = options[:osdeps_mode]
                 end
 
-                if options[:osdeps]
-                    # Install the osdeps for the version control
-                    vcs_to_install = Set.new
-                    selected_packages.each_source_package_name do |pkg_name|
-                        if pkg = ws.manifest.find_package(pkg_name)
-                            if pkg.vcs
-                                vcs_to_install << pkg.vcs.type
-                            end
-                        else
-                            raise "cannot find package #{pkg_name}"
-                        end
-                    end
-                    ws.install_os_packages(vcs_to_install, osdeps_options)
-                end
-
                 ops = Autoproj::Ops::Import.new(ws)
                 source_packages, osdep_packages = 
                     ops.import_packages(selected_packages,
                                     checkout_only: options[:checkout_only],
                                     only_local: options[:only_local],
                                     reset: options[:reset],
                                     recursive: options[:deps],
                                     ignore_errors: options[:keep_going],
                                     parallel: parallel,
-                                    retry_count: options[:retry_count])
+                                    retry_count: options[:retry_count],
+                                    install_vcs_packages: (osdeps_options if options[:osdeps]))
 
                 ws.finalize_setup
                 ws.export_installation_manifest
 
                 if options[:osdeps] && !osdep_packages.empty?
-                    ws.install_os_packages(osdep_packages, osdeps_options)
+                    ws.install_os_packages(osdep_packages, **osdeps_options)
                 end
 
                 ws.export_env_sh(source_packages)
                 Autoproj.message "  updated #{ws.root_dir}/#{Autoproj::ENV_FILENAME}", :green
 
@@ -149,17 +135,17 @@
             end
 
             def load_all_available_package_manifests
                 # Load the manifest for packages that are already present on the
                 # file system
-                ws.manifest.packages.each_value do |pkg|
-                    if File.directory?(pkg.autobuild.srcdir)
+                ws.manifest.each_autobuild_package do |pkg|
+                    if pkg.checked_out?
                         begin
-                            ws.manifest.load_package_manifest(pkg.autobuild.name)
+                            ws.manifest.load_package_manifest(pkg.name)
                         rescue Interrupt
                             raise
                         rescue Exception => e
-                            Autoproj.warn "cannot load package manifest for #{pkg.autobuild.name}: #{e.message}"
+                            Autoproj.warn "cannot load package manifest for #{pkg.name}: #{e.message}"
                         end
                     end
                 end
             end