autoproj 1.8.2.b7 → 1.8.2.b8

data/bin/autoproj_bootstrap

@@ -1025,6 +1025,8 @@ fi
             return found, result
         end
 
+        class MissingOSDep < ConfigError; end
+
         # Resolves the given OS dependencies into the actual packages that need
         # to be installed on this particular OS.
         #
@@ -1035,14 +1037,14 @@ fi
             dependencies.each do |name|
                 result = resolve_package(name)
                 if !result
-                    raise ConfigError.new, "there is no osdeps definition for #{name}"
+                    raise MissingOSDep.new, "there is no osdeps definition for #{name}"
                 elsif result.empty?
                     os_names, os_versions = OSDependencies.operating_system
-                    raise ConfigError.new, "there is an osdeps definition for #{name}, but not for this operating system and version (resp. #{os_names.join(", ")} and #{os_versions.join(", ")})"
+                    raise MissingOSDep.new, "there is an osdeps definition for #{name}, but not for this operating system and version (resp. #{os_names.join(", ")} and #{os_versions.join(", ")})"
                 else
                     result.each do |handler, status, packages|
                         if status == FOUND_NONEXISTENT
-                            raise ConfigError.new, "there is an osdep definition for #{name}, and it explicitely states that this package does not exist on your OS"
+                            raise MissingOSDep.new, "there is an osdep definition for #{name}, and it explicitely states that this package does not exist on your OS"
                         end
                         if entry = all_packages.find { |h, _| h == handler }
                             entry[1].concat(packages)

data/lib/autoproj/autobuild.rb

@@ -106,6 +106,8 @@ module Autobuild
                 __depends_on__(pkg)
             end
             @os_packages |= pkg_os.to_set
+        rescue Autoproj::OSDependencies::MissingOSDep
+            Autoproj.manifest.add_exclusion(name, "the #{name} osdep is not available on this operating system")
         end
 
         def depends_on_os_package(name)

data/lib/autoproj/osdeps.rb

@@ -926,6 +926,8 @@ fi
             return found, result
         end
 
+        class MissingOSDep < ConfigError; end
+
         # Resolves the given OS dependencies into the actual packages that need
         # to be installed on this particular OS.
         #
@@ -936,14 +938,14 @@ fi
             dependencies.each do |name|
                 result = resolve_package(name)
                 if !result
-                    raise ConfigError.new, "there is no osdeps definition for #{name}"
+                    raise MissingOSDep.new, "there is no osdeps definition for #{name}"
                 elsif result.empty?
                     os_names, os_versions = OSDependencies.operating_system
-                    raise ConfigError.new, "there is an osdeps definition for #{name}, but not for this operating system and version (resp. #{os_names.join(", ")} and #{os_versions.join(", ")})"
+                    raise MissingOSDep.new, "there is an osdeps definition for #{name}, but not for this operating system and version (resp. #{os_names.join(", ")} and #{os_versions.join(", ")})"
                 else
                     result.each do |handler, status, packages|
                         if status == FOUND_NONEXISTENT
-                            raise ConfigError.new, "there is an osdep definition for #{name}, and it explicitely states that this package does not exist on your OS"
+                            raise MissingOSDep.new, "there is an osdep definition for #{name}, and it explicitely states that this package does not exist on your OS"
                         end
                         if entry = all_packages.find { |h, _| h == handler }
                             entry[1].concat(packages)

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.b7"
+    VERSION = "1.8.2.b8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.b7
+  version: 1.8.2.b8
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &17010120 !ruby/object:Gem::Requirement
+  requirement: &16778020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *17010120
+  version_requirements: *16778020
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &17009160 !ruby/object:Gem::Requirement
+  requirement: &16777080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *17009160
+  version_requirements: *16777080
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &17008280 !ruby/object:Gem::Requirement
+  requirement: &16776500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *17008280
+  version_requirements: *16776500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17007580 !ruby/object:Gem::Requirement
+  requirement: &16775640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *17007580
+  version_requirements: *16775640
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17006800 !ruby/object:Gem::Requirement
+  requirement: &16774300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *17006800
+  version_requirements: *16774300
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.