autoproj 2.0.0.rc41 → 2.0.0.rc42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d0b20db732502f99f80c293de6b432fa3efb44e
-  data.tar.gz: 5b94a0795ead67203aa0fb9a75b0c8539d94b88e
+  metadata.gz: fa089f772cf7682ac2d74d05851effa2c21e7ffd
+  data.tar.gz: 0ad031e321b6ee31932488de6c399990f34ea0c2
 SHA512:
-  metadata.gz: e83690a10494761eb928876a783bc0dbe42468cdb46e4a9ff24a70b1d24164fb351adca407bea5cd506fd883c1f950b14a7789915058d79f6c12c5a4f3e04947
-  data.tar.gz: 79a383acbd91e887bf26912ac9a375f563a4881f125dad49cc2df58c66a762afb02c74ed16bb06d175c5e9c39a55b24396f93a065d06b0ceb4de31373f4f0e74
+  metadata.gz: 5a7f64e6988bb2105ede4c7907f98a12cd309442d44cef7a688ecaae1b446c596eea8f7e22b6b5c0ee54c3af2758fd1a7cd338c1457e4487436ff12af9d0daf7
+  data.tar.gz: 498d3119d750f2714c8c6572e9ae56a21f8b9ef5c15cb2e7ba452bf12491a727ac7cc2d09bd8422ab1ed1d9560c8c9656858866ee74b9e1d3ae1153a5795f484

data/lib/autoproj/os_package_resolver.rb

@@ -201,16 +201,26 @@ def merge(info)
 
                     # Warn if the new osdep definition resolves to a different
                     # set of packages than the old one
-                    old_resolved = resolve_package(h).inject(Hash.new) do |osdep_h, (handler, status, list)|
+                    old_resolved = resolve_package(h, resolve_recursive: false).inject(Hash.new) do |osdep_h, (handler, status, list)|
                         osdep_h[handler] = [status, list.dup]
                         osdep_h
                     end
-                    new_resolved = info.resolve_package(h).inject(Hash.new) do |osdep_h, (handler, status, list)|
+                    new_resolved = info.resolve_package(h, resolve_recursive: false).inject(Hash.new) do |osdep_h, (handler, status, list)|
                         osdep_h[handler] = [status, list.dup]
                         osdep_h
                     end
                     if old_resolved != new_resolved
-                        Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overridden by #{new}: resp. #{old_resolved} and #{new_resolved}")
+                        Autoproj.warn "osdeps definition for #{h}, previously defined in #{old} overridden by #{new}:"
+                        first = true
+                        old_resolved.each do |handler, (_, packages)|
+                            Autoproj.warn "  #{first ? 'resp. ' : '      '}#{handler}: #{packages.map(&:to_s).join(", ")}"
+                            first = false
+                        end
+                        first = true
+                        new_resolved.each do |handler, (_, packages)|
+                            Autoproj.warn "  #{first ? 'and   ' : '      '}#{handler}: #{packages.map(&:to_s).join(", ")}"
+                            first = false
+                        end
                     end
                 end
                 v2
@@ -458,6 +468,12 @@ def resolve_name(name)
             path
         end
 
+        # Null object class that is used to mark recursive resolution when
+        # calling {#resolve_package} with resolve_recursive set to false
+        class OSDepRecursiveResolver
+            def self.to_s; 'osdep' end
+        end
+
         # Return the list of packages that should be installed for +name+
         #
         # The following two simple return values are possible:
@@ -475,7 +491,7 @@ def resolve_name(name)
         # and FOUND_NONEXISTENT if the nonexistent keyword is used for this OS
         # name and version. The package list might be empty even if status ==
         # FOUND_PACKAGES, for instance if the ignore keyword is used.
-        def resolve_package(name)
+        def resolve_package(name, resolve_recursive: true)
             if resolve_package_cache.has_key?(name)
                 return resolve_package_cache[name]
             end
@@ -523,12 +539,16 @@ def resolve_package(name)
             # Recursive resolutions
             found, pkg = partition_osdep_entry(name, dep_def, ['osdep'], [], os_names, os_versions)
             if found
-                pkg.each do |pkg_name|
-                    resolved = resolve_package(pkg_name)
-                    if !resolved
-                        raise InvalidRecursiveStatement, "osdep #{pkg_name} does not exist. It is referred to by #{name}."
+                if resolve_recursive
+                    pkg.each do |pkg_name|
+                        resolved = resolve_package(pkg_name)
+                        if !resolved
+                            raise InvalidRecursiveStatement, "the '#{name}' osdep refers to another osdep, '#{pkg_name}', which does not seem to exist"
+                        end
+                        result.concat(resolved)
                     end
-                    result.concat(resolved)
+                else
+                    result << [OSDepRecursiveResolver, found, pkg]
                 end
             end
 
@@ -536,7 +556,11 @@ def resolve_package(name)
                 args.last.freeze
             end
             result.freeze
-            resolve_package_cache[name] = result
+            if resolve_recursive
+                resolve_package_cache[name] = result
+            else
+                result
+            end
         end
 
         # Value returned by #resolve_package and #partition_osdep_entry in

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc41"
+    VERSION = "2.0.0.rc42"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc41
+  version: 2.0.0.rc42
 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: