autoproj 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25acae3976b79a7315a31833d05307dcb4895f54
-  data.tar.gz: d9d1ab21a7aabc251e31f315f5c07d07fb068950
+  metadata.gz: 1cf7f7d0c8d98b09aff6103fed65c4c4c5b9f20b
+  data.tar.gz: 5175feae1b29209f1cd5d3706737e2561d3f982c
 SHA512:
-  metadata.gz: 42e0965907323cdeff72cc1b5754b4b5f35202ac295d603348d669d868d31df9170a242cdf901ac6ecba0c43d3e0bede54c9b2f368e0d0f0e79c23f4e39ada70
-  data.tar.gz: 2903a67c90039c2fa5f0d4101477815559b77586edc3fbe11fb6722515b499a0fac346c6b009a1924af85a98daa20be837181fe02a93bdcc965b08dd01d3a146
+  metadata.gz: cab8e9584a00aebb183cacdafc88487830a73d94ea3228d62cb8f3e8524b10a5980526d62f2bf52f696c60dd8a0615d765736c178db9f1ec085da7d56b97e829
+  data.tar.gz: da39b66b640c0e62143e520d9e6adebc16a02c2b333728133f685ae263f4057893d1e1c8f9086cc8033bf8a788b89d8fc753d1294372a38e1b5cdb5b43b5e69a

data/lib/autoproj/cli/build.rb

@@ -21,7 +21,7 @@ def run(selected_packages, options)
                     rebuild: false,
                     parallel: nil
 
-                command_line_selection, source_packages, osdep_packages =
+                command_line_selection, source_packages, _osdep_packages =
                     super(selected_packages, options.merge(checkout_only: true))
 
                 parallel = build_options[:parallel] || ws.config.parallel_build_level

data/lib/autoproj/cli/update.rb

@@ -9,7 +9,7 @@ def validate_options(selection, options)
                 selection, options = super
 
                 if from = options[:from]
-                    options[:from] = Autoproj::InstallationManifest.from_workspace_root(options[:from])
+                    options[:from] = Autoproj::InstallationManifest.from_workspace_root(from)
                 end
 
                 if options[:aup] && !options[:all] && selection.empty?

data/lib/autoproj/manifest.rb

@@ -310,7 +310,7 @@ def clear_ignored
         def excluded?(package_name)
             package_name = validate_package_name_argument(package_name)
 
-            if excluded_in_manifest?(package_name)
+            if !explicitely_selected_in_layout?(package_name) && excluded_in_manifest?(package_name)
                 true
             elsif automatic_exclusions.any? { |pkg_name, | pkg_name == package_name }
                 true
@@ -380,14 +380,20 @@ def excluded_in_manifest?(package_name)
         # disabled on this particular operating system.
         def exclusion_reason(package_name)
             package_name = validate_package_name_argument(package_name)
-            manifest_exclusions.any? do |matcher|
-                if (pkg_set = metapackages[matcher]) && pkg_set.include?(package_name)
-                    return "#{pkg_set.name} is a metapackage listed in the exclude_packages section of the manifest, and it includes #{package_name}"
-                elsif Regexp.new(matcher) === package_name
-                    return "#{package_name} is listed in the exclude_packages section of the manifest"
+            if message = automatic_exclusions[package_name]
+                return message
+            end
+
+            if !explicitely_selected_in_layout?(package_name)
+                manifest_exclusions.each do |matcher|
+                    if (pkg_set = metapackages[matcher]) && pkg_set.include?(package_name)
+                        return "#{pkg_set.name} is a metapackage listed in the exclude_packages section of the manifest, and it includes #{package_name}"
+                    elsif Regexp.new(matcher) === package_name
+                        return "#{package_name} is listed in the exclude_packages section of the manifest"
+                    end
                 end
             end
-            automatic_exclusions[package_name]
+            nil
         end
 
         # Returns true if the given package name has been explicitely added to

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Sylvain Joyeux
@@ -337,3 +337,4 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
+has_rdoc: