autoproj 2.15.2 → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71eef2ce38657cfce5bca1a2ba483c9c37a81c27ddbe4fa402628badc6de228d
-  data.tar.gz: 85ade5a6d5b1369cf35d73c412f4d0ea8f6793e665f04e21a5cbb8c3be2e2b12
+  metadata.gz: 637e55569497703d3288f3d36fe316c204238c65f32e566811223a4bc9028b44
+  data.tar.gz: d55c78b10017e3e9e4b42e879edea1478baaff3c80705eddeca69156c84accf5
 SHA512:
-  metadata.gz: 57fc783407a2c34b7544234a18b6da6e1e6510b37516c794185b27d00d58f6cba6697b835325316c93222eaa147a8d0ecc3e2ee57a795132f8eab64a516bc385
-  data.tar.gz: 2e13951d9cf894f15587542ce21c657ef7252e091bc793e447ce2aa541c24bfcc5bc3dc358d0b5d71c843369dec3de7ed03fd8e55e47895582d56f8ba97d659f
+  metadata.gz: 7b6a24e168732906376569b34ba8a3ce562988d3ce4fcb4bb0eafd0e22726b76fe9fcb0f4dbfc4b7b306d2d6683c7e534f2d8d1e7ae1aebdd2bc4404c6fe21fe
+  data.tar.gz: 14252a325369a374459ce7115ffba28937e58e64e635e15fc1f1295f6208b2ec38c272799f66b1115668a81b30a3334c27375739e15ddcfa3e29ed4119535343

data/lib/autoproj/ops/configuration.rb

@@ -32,10 +32,24 @@ module Autoproj
                         @dag.add_edge p, root_pkg_set
                     end
                 end
+            end
 
-                unless @dag.acyclic?
-                    raise "The package set hierarchy contains cycles: #{@dag.cycles}"
+            def verify_acyclic
+                return if @dag.acyclic?
+
+                Autoproj.fatal "The package sets form (a) cycle(s)"
+                @dag.cycles.each_with_index do |cycle, index|
+                    Autoproj.fatal "== Cycle #{index}"
+                    (cycle + cycle[0, 1]).each_cons(2) do |a, b|
+                        if b.imports.include?(a)
+                            Autoproj.fatal "  #{b.name} depends on #{a.name} in its source.yml"
+                        else
+                            Autoproj.fatal "  #{b.name} is after #{a.name} in the package_sets section of the manifest"
+                        end
+                    end
                 end
+
+                raise ConfigError.new "cycles in package set dependencies"
             end
 
             # Flatten the hierarchy, a establish a sorting
@@ -363,6 +377,7 @@ module Autoproj
             # the local package set (by main configuration) last
             def sort_package_sets_by_import_order(package_sets, root_pkg_set)
                 c = PackageSetHierarchy.new(package_sets, root_pkg_set)
+                c.verify_acyclic
                 sorted_pkg_sets = c.flatten
 
                 if sorted_pkg_sets.last != root_pkg_set

data/lib/autoproj/package_set.rb

@@ -793,23 +793,6 @@ module Autoproj
             vcs
         end
 
-        # Recursively resolve imports for a given package set
-        def self.resolve_imports(pkg_set, parents = Set.new)
-            return Set.new if pkg_set.imports.empty?
-
-            updated_parents = parents | [pkg_set]
-
-            imports = pkg_set.imports.dup
-            pkg_set.imports.each do |p|
-                if parents.include?(p)
-                    raise "Cycling dependency between package sets encountered:" \
-                          "#{p.name} <--> #{pkg_set.name}"
-                end
-                imports.merge(resolve_imports(p, updated_parents))
-            end
-            imports
-        end
-
         # Enumerates the Autobuild::Package instances that are defined in this
         # source
         def each_package

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.15.2"
+    VERSION = "2.15.3"
 end

data/lib/autoproj.rb

@@ -63,7 +63,7 @@ require "utilrb/logger"
 
 module Autoproj
     class << self
-        attr_reader :logger
+        attr_accessor :logger
     end
     @logger = Logger.new(STDOUT)
     logger.level = Logger::WARN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.15.2
+  version: 2.15.3
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild