autoproj 1.7.17 → 1.7.18

data/History.txt

@@ -1,3 +1,6 @@
+= Version 1.7.18
+ * properly detect and report circular dependencies
+
 = Version 1.7.17
  * fix some return values in PackageManifest as REXML#text returns nil if no
    text element is present while nokogiri was returning an empty string

data/lib/autoproj/cmdline.rb

@@ -528,7 +528,7 @@ module Autoproj
             selected_packages
         end
 
-        def self.verify_package_availability(pkg_name)
+        def self.verify_package_availability(pkg_name, stack = Array.new)
             if reason = Autoproj.manifest.exclusion_reason(pkg_name)
                 raise ConfigError.new, "#{pkg_name} is excluded from the build: #{reason}"
             end
@@ -536,13 +536,18 @@ module Autoproj
             if !pkg
                 raise ConfigError.new, "#{pkg_name} does not seem to exist"
             end
+            stack << pkg_name
 
             # Verify that its dependencies are there, and add
             # them to the selected_packages set so that they get
             # imported as well
             pkg.dependencies.each do |dep_name|
+                if stack.include?(dep_name)
+                    raise ConfigError.new, "circular dependency #{pkg.name} => #{dep_name}"
+                end
+
                 begin
-                    verify_package_availability(dep_name)
+                    verify_package_availability(dep_name, stack.dup)
                 rescue ConfigError => e
                     raise e, "#{pkg_name} depends on #{dep_name}, but #{e.message}"
                 end

data/lib/autoproj/manifest.rb

@@ -914,6 +914,10 @@ module Autoproj
             @user_blocks = []
         end
 
+        def name
+            autobuild.name
+        end
+
         def add_setup_block(block)
             user_blocks << block
             if setup?

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.17"
+    VERSION = "1.7.18"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 1
   - 7
-  - 17
-  version: 1.7.17
+  - 18
+  version: 1.7.18
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-02-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of software packages