autoproj 1.11.0.rc11 → 1.11.0.rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c81d44a11252188106d89008e520814b7d428c
-  data.tar.gz: 026938c50697e48764c7389bc17428ab894cf620
+  metadata.gz: 9058233d769c69abb2b7268a778f40c048e40a11
+  data.tar.gz: 06e3fb0789c5aa42d5db2729659ca03a710ad2db
 SHA512:
-  metadata.gz: 47c222b82563dd4d3b5006d948e182bd36ff10a9c8fabe28becb349812669f9326e4d411e9e579a059aff79dbfbe4547ead87e0c80ff21a553f79082a11bdb98
-  data.tar.gz: 150bd14da0f70108b681edef5377824a87bf0b48ffc008f24da0ec081ffb759345d997f64118c883d903a4bd8bd268ffda0b234c385072caacc67764b477a0c2
+  metadata.gz: ce8b28fa3cf0ac43790c2afbc757053c1765c038bda470f3cb0556f0d88ee7d65f63c96909a854df43870a4603031ca84582bd9c42d04d5369a26575b081a194
+  data.tar.gz: 7f0a1d542df5a044009ef048914a93ddd1e5814c540feb4a2315562211410216018d7a1acdada80e98ed402920ef65cd5d5d509830125022fbdb39653eb046a7

data/bin/autoproj_bootstrap

@@ -1732,6 +1732,8 @@ fi
             return [distributor, [codename, version]]
         end
 
+        class InvalidRecursiveStatement < Autobuild::Exception; end
+
         # Return the list of packages that should be installed for +name+
         #
         # The following two simple return values are possible:
@@ -1794,7 +1796,11 @@ fi
             found, pkg = partition_osdep_entry(name, dep_def, ['osdep'], [], os_names, os_versions)
             if found
                 pkg.each do |pkg_name|
-                    result.concat(resolve_package(pkg_name))
+                    resolved = resolve_package(pkg_name)
+                    if !resolved
+                        raise InvalidRecursiveStatement, "osdep #{pkg_name} does not exist. It is referred to by #{name}."
+                    end
+                    result.concat(resolved)
                 end
             end
 
@@ -2753,10 +2759,17 @@ ruby21:
   - ruby2.1-dev
   - rake
   - rubygems-integration
+  ubuntu:
+    '14.10':
+    - ruby2.1
+    - ruby2.1-dev
+    - rake
+    - rubygems-integration
+    default: ignore
   fedora: ruby-devel
   macos-brew:
   - gem: rake
-  default,ubuntu: ignore
+  default: ignore
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore

data/lib/autoproj/default.osdeps

@@ -63,15 +63,22 @@ ruby20:
     default: ignore # we assume that if the user has a ruby 2.0 runtime, it is usable
 
 ruby21:
-    debian:
-        - ruby2.1
-        - ruby2.1-dev
-        - rake
-        - rubygems-integration
-    fedora: ruby-devel
-    macos-brew:
-        - gem: rake
-    default,ubuntu: ignore # we assume that if the user has a ruby 2.1 runtime, it is usable
+  debian:
+      - ruby2.1
+      - ruby2.1-dev
+      - rake
+      - rubygems-integration
+  ubuntu:
+      '14.10':
+          - ruby2.1
+          - ruby2.1-dev
+          - rake
+          - rubygems-integration
+      default: ignore
+  fedora: ruby-devel
+  macos-brew:
+      - gem: rake
+  default: ignore # we assume that if the user has a ruby 2.1 runtime, it is usable
 
 build-essential:
   debian,ubuntu: build-essential

data/lib/autoproj/ops/build.rb

@@ -31,7 +31,6 @@ module Autoproj
                     # functionality
                     managers = Autoproj.osdeps.setup_package_handlers
                     managers.each do |mng|
-                        puts mng.class
                         if mng.respond_to?(:reinstall)
                             mng.reinstall
                         end

data/lib/autoproj/osdeps.rb

@@ -1271,6 +1271,8 @@ fi
             return [distributor, [codename, version]]
         end
 
+        class InvalidRecursiveStatement < Autobuild::Exception; end
+
         # Return the list of packages that should be installed for +name+
         #
         # The following two simple return values are possible:
@@ -1333,7 +1335,11 @@ fi
             found, pkg = partition_osdep_entry(name, dep_def, ['osdep'], [], os_names, os_versions)
             if found
                 pkg.each do |pkg_name|
-                    result.concat(resolve_package(pkg_name))
+                    resolved = resolve_package(pkg_name)
+                    if !resolved
+                        raise InvalidRecursiveStatement, "osdep #{pkg_name} does not exist. It is referred to by #{name}."
+                    end
+                    result.concat(resolved)
                 end
             end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.11.0.rc11"
+    VERSION = "1.11.0.rc12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc11
+  version: 1.11.0.rc12
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild