autoproj 2.0.0.rc14 → 2.0.0.rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ec9441fdf0ffd2541d5bf217412d4f153f77b6
-  data.tar.gz: e1c4e19cee12aa7629a1fcbe19d5c9c9ad8be340
+  metadata.gz: 72bfb787ad1c7703f07969b97c019c9fd49dc3ec
+  data.tar.gz: 830d1225e29863caecdbbdea21b40a80975c61c9
 SHA512:
-  metadata.gz: 86a003101f5024f513b7c93ee4749aa8e9097f85a6c10eb13666fc56dcaf3b3cb7c0eef28dbf556343408a942afe240b3f39e4d977c9073e93744edbccdcaf43
-  data.tar.gz: 58780f3613e8d50c1890cfa3c95efcd51d6f4e3e1ca5aa000e74dfe07324aad389c3b78882878a3db0a223bf9b1f7c74b066f4e08fdd0c7281bebc68fa38db89
+  metadata.gz: 2558027c520e214fa512cb70efb99d95bc69c342ff864a16c9a23ff64e75972a085f70d62bd95e6cb08282379e15741cdfc22af70fdcc5a7d1f979a37479b392
+  data.tar.gz: 77c978c7afe274015b889a868a1514abb24ec515e6a13a9045b4747f9718120a0f18b293064efa3d2064d1dad626ec7ecbd6c750f8e114789b6b61f3dfda05d9

data/bin/autoproj_bootstrap

@@ -489,7 +489,6 @@ module Autoproj
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                puts "calling autoproj envsh #{autoproj_options}"
                 if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     exit 1
                 end

data/bin/autoproj_install

@@ -489,7 +489,6 @@ module Autoproj
                 require 'autobuild'
                 puts "saving env.sh and .autoproj/env.sh"
                 save_env_sh(*vars)
-                puts "calling autoproj envsh #{autoproj_options}"
                 if !system(Gem.ruby, autoproj_path, 'envsh', *autoproj_options)
                     exit 1
                 end

data/lib/autoproj.rb

@@ -54,7 +54,7 @@ def self.warn_deprecated_level
     def self.warn_deprecated_level=(level)
         @warn_deprecated_level = level
     end
-    @warn_deprecated_level = 0
+    @warn_deprecated_level = 1
 
     def self.warn_deprecated(method, msg, level = 0)
         if level >= @warn_deprecated_level

data/lib/autoproj/autobuild.rb

@@ -534,7 +534,7 @@ def configuration_option(*opts, &block)
 #
 # See Autoproj.user_config
 def user_config(key)
-    Autoproj.config.get(key)
+    Autoproj.user_config(key)
 end
 
 class Autobuild::Git

data/lib/autoproj/cli/base.rb

@@ -6,6 +6,9 @@ module CLI
         class Base
             include Ops::Tools
 
+            # The underlying workspace
+            # 
+            # @return [Workspace]
             attr_reader :ws
 
             def initialize(ws = nil)
@@ -44,14 +47,20 @@ def normalize_command_line_package_selection(selection)
                 return selection, config_selected
             end
 
-            def resolve_user_selection(selected_packages, options = Hash.new)
+            # Resolve a user-provided selection
+            #
+            # @param (see expand_package_selection)
+            # @return [(PackageSelection,Array<String>)] the resolved selections
+            #   and the list of entries in selected_packages that have not been
+            #   resolved
+            def resolve_user_selection(selected_packages, **options)
                 if selected_packages.empty?
                     return ws.manifest.default_packages
                 end
                 selected_packages = selected_packages.to_set
 
                 selected_packages, nonresolved = ws.manifest.
-                    expand_package_selection(selected_packages, options)
+                    expand_package_selection(selected_packages, **options)
 
                 # Try to auto-add stuff if nonresolved
                 nonresolved.delete_if do |sel|
@@ -80,29 +89,56 @@ def resolve_user_selection(selected_packages, options = Hash.new)
                 return selected_packages, nonresolved
             end
 
-            def resolve_selection(manifest, user_selection, options = Hash.new)
-                options = Kernel.validate_options options,
-                    checkout_only: true,
-                    only_local: false,
-                    recursive: true,
-                    ignore_non_imported_packages: false
-
+            # Resolves the user-provided selection into the set of packages that
+            # should be processed further
+            #
+            # While {#resolve_user_selection} really only considers packages and
+            # strings, this methods takes care of doing recursive resolution of
+            # dependencies, as well as splitting the packages into source and
+            # osdep packages.
+            #
+            # It loads the packages in sequence (that's the only way the full
+            # selection can be computed), and is therefore responsible for
+            # updating the packages if needed (disabled by default)
+            #
+            # @param [Array<String>] user_selection the selection provided by
+            #   the user
+            # @param [Boolean] checkout_only if packages should be updated
+            #   (false) or only missing packages should be checked out (the
+            #   default)
+            # @param [Boolean] only_local if the update/checkout operation is
+            #   allowed to access the network. If only_local is true but some
+            #   packages should be checked out, the update will fail
+            # @param [Boolean] recursive whether the resolution should be done
+            #   recursively (i.e. dependencies of directly selected packages
+            #   should be added) or not
+            # @param [Boolean] ignore_non_imported_packages whether packages
+            #   that are not imported should simply be ignored. Setting
+            #   checkout_only to true and ignore_non_imported_packages to true
+            #   guarantees in effect that no import operation will take place,
+            #   only loading
+            # @return [(Array<String>,Array<String>,PackageSelection)] the list
+            #   of selected source packages, the list of selected OS packages and
+            #   the package selection resolution object
+            #
+            # @see resolve_user_selection
+            def resolve_selection(user_selection, checkout_only: true, only_local: false, recursive: true, ignore_non_imported_packages: false)
                 resolved_selection, _ = resolve_user_selection(user_selection, filter: false)
-                if options[:ignore_non_imported_packages]
-                    manifest.each_autobuild_package do |pkg|
+                if ignore_non_imported_packages
+                    ws.manifest.each_autobuild_package do |pkg|
                         if !File.directory?(pkg.srcdir)
-                            manifest.ignore_package(pkg.name)
+                            ws.manifest.ignore_package(pkg.name)
                         end
                     end
                 end
-                resolved_selection.filter_excluded_and_ignored_packages(manifest)
+                resolved_selection.filter_excluded_and_ignored_packages(ws.manifest)
 
                 ops = Ops::Import.new(ws)
                 source_packages, osdep_packages = ops.import_packages(
                     resolved_selection,
-                    checkout_only: options[:checkout_only],
-                    only_local: options[:only_local],
-                    recursive: options[:recursive],
+                    checkout_only: checkout_only,
+                    only_local: only_local,
+                    recursive: recursive,
                     warn_about_ignored_packages: false)
 
                 return source_packages, osdep_packages, resolved_selection

data/lib/autoproj/cli/clean.rb

@@ -18,7 +18,6 @@ def run(selection, options = Hash.new)
                 initialize_and_load
                 packages, _ = normalize_command_line_package_selection(selection)
                 source_packages, * = resolve_selection(
-                    ws.manifest,
                     selection,
                     recursive: false,
                     ignore_non_imported_packages: true)

data/lib/autoproj/cli/inspection_tool.rb

@@ -46,7 +46,7 @@ def finalize_setup(packages = [], options = Hash.new)
                     resolve_user_selection(packages)
                     ws.finalize_package_setup
                     source_packages, osdep_packages, resolved_selection =
-                        resolve_selection(ws.manifest, packages, options)
+                        resolve_selection(packages, options)
                     ws.finalize_setup
                     ws.export_installation_manifest
                     return source_packages, osdep_packages, resolved_selection, config_selected

data/lib/autoproj/cli/update.rb

@@ -35,6 +35,7 @@ def validate_options(packages, options)
             end
 
             def run(selected_packages, options)
+                ws.manifest.accept_unavailable_osdeps = !options[:osdeps]
                 explicit_selection = !selected_packages.empty?
                 selected_packages, config_selected =
                     normalize_command_line_package_selection(selected_packages)

data/lib/autoproj/default.osdeps

@@ -129,7 +129,7 @@ hg:
 
 svn:
   debian,ubuntu: subversion
-  gentoo: dev-util/subversion
+  gentoo: dev-vcs/subversion
   arch: subversion
   fedora: subversion
   darwin: subversion

data/lib/autoproj/find_workspace.rb

@@ -34,7 +34,7 @@ def self.find_prefix_dir(base_dir = default_find_base_dir)
     # @return [String,nil] the root of the workspace directory, or nil if
     #   there's none
     def self.find_v2_root_dir(base_dir, config_field_name)
-        path = Pathname.new(base_dir)
+        path = Pathname.new(base_dir).expand_path
         while !path.root?
             if (path + ".autoproj").exist?
                 break
@@ -50,7 +50,16 @@ def self.find_v2_root_dir(base_dir, config_field_name)
         if config_path.exist?
             config = YAML.load(config_path.read) || Hash.new
             result = config[config_field_name] || path.to_s
-            File.expand_path(result, path.to_s)
+            result = File.expand_path(result, path.to_s)
+            if result == path.to_s
+                return result
+            end
+            resolved = find_v2_root_dir(result, config_field_name)
+
+            if !resolved || (resolved != result)
+                raise ArgumentError, "found #{path} as possible workspace root for #{base_dir}, but it contains a configuration file in #{config_path} that points to #{result} and #{result} is not an autoproj workspace root"
+            end
+            resolved
         else
             path.to_s 
         end

data/lib/autoproj/git_server_configuration.rb

@@ -106,8 +106,10 @@ def self.git_server_configuration(name, base_url, options = Hash.new)
     end
 
     def self.gitorious_server_configuration(name, base_url, options = Hash.new)
-        Autoproj.warn "gitorious_server_configuration is deprecated, replace by git_server_configuration"
-        Autoproj.warn "Note that the call interface has not changed, you only need to change the method name"
+        Autoproj.warn_deprecated "gitorious_server_configuration",
+            "use require 'git_server_configuration' and
+            Autoproj.git_server_configuration instead. note that the method call
+            interface has not changed, you just have to change the name(s)"
         git_server_configuration(name, base_url, options)
     end
 end

data/lib/autoproj/gitorious.rb

@@ -1,3 +1 @@
-Autoproj.warn "gitorious_server_configuration is deprecated, use require 'git_server_configuration' and Autoproj.git_server_configuration instead"
-Autoproj.warn "note that the method call interface has not changed, you just have to change the name(s)"
 require 'autoproj/git_server_configuration'

data/lib/autoproj/manifest.rb

@@ -71,6 +71,15 @@ def load(file)
         # A set of other autoproj installations that are being reused
         attr_reader :reused_installations
 
+        # Whether {#resolve_package_name} should raise if an osdep is found that
+        # is not available on the current operating system, or simply return it
+        #
+        # @return [Boolean]
+        def accept_unavailable_osdeps?; !!@accept_unavailable_osdeps end
+
+        # Sets {#accept_unavailable_osdeps?}
+        def accept_unavailable_osdeps=(flag); @accept_unavailable_osdeps = flag end
+
         # True if osdeps should be handled in update and build, or left to the
         # osdeps command
         def auto_osdeps?
@@ -108,6 +117,7 @@ def initialize
             @reused_installations = Array.new
             @ignored_packages = Set.new
             @manifest_exclusions = Set.new
+            @accept_unavailable_osdeps = false
 
             @constant_definitions = Hash.new
             @package_sets << LocalPackageSet.new(self)
@@ -334,14 +344,21 @@ def register_package_set(pkg_set)
         end
 
         # Register a new package
-        def register_package(package, block, source, file)
-            pkg = PackageDefinition.new(package, source, file)
+        #
+        # @param [Autobuild::Package] package
+        # @param [#call,nil] block a setup block
+        # @param [PackageSet] package_set the package set that defines the package
+        # @param [String] file the file in which the package is defined
+        # @return [PackageDefinition]
+        def register_package(package, block = nil, package_set = main_package_set, file = nil)
+            pkg = PackageDefinition.new(package, package_set, file)
             if block
                 pkg.add_setup_block(block)
             end
             @packages[package.name] = pkg
-            @metapackages[pkg.package_set.name].add(pkg.autobuild)
-            @metapackages["#{pkg.package_set.name}.all"].add(pkg.autobuild)
+            metapackage pkg.package_set.name, pkg.autobuild
+            metapackage "#{pkg.package_set.name}.all", pkg.autobuild
+            pkg
         end
 
         # Returns the package set that defines a package
@@ -538,14 +555,22 @@ def main_package_set
             each_package_set.find(&:main?)
         end
 
-        # Resolves the given +name+, where +name+ can either be the name of a
-        # source or the name of a package.
-        #
-        # The returned value is a list of pairs:
+        # Resolves a name into a set of source and osdep packages
         #
-        #   [type, package_name]
+        # @param [String] name the name to be resolved. It can either be the
+        # name of a source package, an osdep package or a metapackage (e.g.
+        # package set).
         #
-        # where +type+ can either be :package or :osdeps (as symbols)
+        # @return [nil,Array] either nil if there is no such osdep, or a list of
+        #   (type, package_name) pairs where type is either :package or :osdep and
+        #   package_name the corresponding package name
+        # @raise [PackageNotFound] if the given package name cannot be resolved
+        #   into a package. If {#accept_unavailable_osdeps?} is false (the
+        #   default), the exception will be raised if the package is known to be
+        #   an osdep, but it is not available on the local operating system (as
+        #   defined by {#os_package_resolver}), and there has been no source
+        #   fallback defined with {#add_osdeps_overrides}. If true, it will
+        #   return such a package as an osdep.
         def resolve_package_name(name)
             if pkg_set = find_metapackage(name)
                 pkg_names = pkg_set.each_package.map(&:name)
@@ -557,8 +582,8 @@ def resolve_package_name(name)
             pkg_names.each do |pkg|
                 begin
                     result.concat(resolve_single_package_name(pkg))
-                rescue PackageNotFound
-                    raise PackageNotFound, "cannot resolve #{pkg}: it is not a package, not a metapackage and not an osdep"
+                rescue PackageNotFound => e
+                    raise PackageNotFound, "cannot resolve #{pkg}: #{e}", e.backtrace
                 end
             end
             result
@@ -585,6 +610,8 @@ def resolve_packages_dependencies(*root_names)
             result
         end
 
+        # @api private
+        #
         # Resolves a package name, where +name+ cannot be resolved as a
         # metapackage
         #
@@ -604,6 +631,16 @@ def resolve_single_package_name(name)
             end
         end
 
+        # @api private
+        #
+        # Resolve a package name that is assumed to be a source package
+        #
+        # @param [String] name the name to be resolved
+        # @return [nil,Array] either nil if there is no such osdep, or a list of
+        #   (type, package_name) pairs where type is either :package or :osdep and
+        #   package_name the corresponding package name
+        # @raise PackageNotFound if the given package name cannot be resolved
+        #   into a package
         def resolve_package_name_as_source_package(name)
             if pkg = find_autobuild_package(name)
                 return [[:package, pkg.name]]
@@ -620,10 +657,17 @@ def resolve_package_name_as_source_package(name)
         # @return [nil,Array] either nil if there is no such osdep, or a list of
         #   (type, package_name) pairs where type is either :package or :osdep and
         #   package_name the corresponding package name
+        # @raise PackageNotFound if the given package name cannot be resolved
+        #   into a package. If {#accept_unavailable_osdeps?} is false (the
+        #   default), the exception will be raised if the package is known to be
+        #   an osdep, but it is not available on the local operating system (as
+        #   defined by {#os_package_resolver}), and there has been no source
+        #   fallback defined with {#add_osdeps_overrides}.
+        #   If true, it will return it as an osdep.
         def resolve_package_name_as_osdep(name)
 	    osdeps_availability = os_package_resolver.availability_of(name)
             if osdeps_availability == OSPackageResolver::NO_PACKAGE
-                raise PackageNotFound, "cannot resolve #{name}: it is not an osdep"
+                raise PackageNotFound, "#{name} is not an osdep"
             end
 
             # There is an osdep definition for this package, check the
@@ -638,7 +682,7 @@ def resolve_package_name_as_osdep(name)
                 end.uniq
             elsif !osdeps_available && (pkg = find_autobuild_package(name))
                 return [[:package, pkg.name]]
-            elsif osdeps_available
+            elsif osdeps_available || accept_unavailable_osdeps?
                 return [[:osdeps, name]]
             elsif osdeps_availability == OSPackageResolver::WRONG_OS
                 raise PackageNotFound, "#{name} is an osdep, but it is not available for this operating system"
@@ -670,23 +714,33 @@ def find_metapackage(name)
             @metapackages[name.to_s]
         end
 
-        # call-seq:
-        #   metapackage 'meta_name' => Metapackage
-        #   metapackage 'meta_name', 'pkg1', 'pkg2' => Metapackage
+        # Add packages to a metapackage, creating the metapackage if it does not
+        # exist
         #
-        # Metapackage definition
+        # @overload metapackage(name)
+        #   Create a metapackage
         #
-        # In the first form, returns a Metapackage instance for the metapackage
-        # named 'meta_name'.
+        #   @return [Metapackage]
+        #
+        # @overload metapackage(name, *packages)
+        #   Add packages to a new or existing metapackage
+        #
+        #   @param [String] name the name of the metapackage. If it already
+        #     exists, the packages will be added to it.
+        #   @param [String] packages list of package names to be added to the
+        #     metapackage
+        #   @return [Metapackage]
         #
-        # In the second form, adds the listed packages to the metapackage and
-        # returns the Metapackage instance
         def metapackage(name, *packages, &block)
             meta = (@metapackages[name.to_s] ||= Metapackage.new(name))
-            packages.each do |pkg_name|
-                package_names = resolve_package_set(pkg_name)
-                package_names.each do |pkg_name|
-                    meta.add(find_autobuild_package(pkg_name))
+            packages.each do |pkg|
+                if pkg.respond_to?(:to_str)
+                    package_names = resolve_package_set(pkg)
+                    package_names.each do |pkg_name|
+                        meta.add(find_autobuild_package(pkg_name))
+                    end
+                else
+                    meta.add(pkg)
                 end
             end
 
@@ -982,14 +1036,12 @@ def filter_os_packages(required_os_packages, package_os_deps)
         #
         # The :force option allows to force the usage of the source package(s),
         # regardless of the availability of the osdeps package.
-        def add_osdeps_overrides(osdeps_name, options)
-            options = Kernel.validate_options options, package: osdeps_name, packages: [], force: false
-            if pkg = options.delete(:package)
-                options[:packages] << pkg
+        def add_osdeps_overrides(osdeps_name, package: osdeps_name, packages: [], force: false)
+            if package
+                packages << package
             end
-            packages = options[:packages]
             packages.each { |pkg_name| resolve_package_name(pkg_name) }
-            @osdeps_overrides[osdeps_name.to_s] = options
+            @osdeps_overrides[osdeps_name.to_s] = Hash[packages: packages, force: force]
         end
 
         # Remove any OSDeps override that has previously been added with

data/lib/autoproj/options.rb

@@ -1,74 +1,62 @@
 module Autoproj
     # @deprecated use config.override instead
     def self.override_option(option_name, value)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.override(option_name, value)
     end
     # @deprecated use config.reset instead
     def self.reset_option(key)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.reset(key)
     end
     # @deprecated use config.set(key, value, user_validated) instead
     def self.change_option(key, value, user_validated = false)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.set(key, value, user_validated)
     end
     # @deprecated use config.validated_values instead
     def self.option_set
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.validated_values
     end
     # @deprecated use config.get(key) instead
     def self.user_config(key)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.get(key)
     end
     # @deprecated use config.declare(name, type, options, &validator) instead
     def self.configuration_option(name, type, options, &validator)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.declare(name, type, options, &validator)
     end
     # @deprecated use config.declared?(name, type, options, &validator) instead
     def self.declared_option?(name)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.declared?(name)
     end
     # @deprecated use config.configure(option_name) instead
     def self.configure(option_name)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.configure(option_name)
     end
     # @deprecated use config.has_value_for?(name)
     def self.has_config_key?(name)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.has_value_for?(name)
     end
     # @deprecated use config.shell_helpers? instead
     def self.shell_helpers?
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.shell_helpers?
     end
     # @deprecated use config.shell_helpers= instead
     def self.shell_helpers=(flag)
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.shell_helpers = flag
     end
 
     def self.save_config
-        Autoproj.warn "#{__method__} is deprecated, use the API on Autoproj.config (from Autoproj::Configuration) instead"
-        caller.each { |bt| Autoproj.warn "  #{bt}" }
+        Autoproj.warn_deprecated __method__, "use the API on Autoproj.config (from Autoproj::Configuration) instead"
         config.save
     end
 

data/lib/autoproj/os_package_resolver.rb

@@ -139,10 +139,8 @@ def os_package_manager
             if !instance_variable_defined?(:@os_package_manager)
                 os_names, _ = operating_system
                 os_name = os_names.find { |name| OS_PACKAGE_MANAGERS[name] }
-                @os_package_manager = OS_PACKAGE_MANAGERS[os_name]
-                if !@os_package_manager
-                    raise "unsupported OS #{os_names.join(", ")}"
-                end
+                @os_package_manager = OS_PACKAGE_MANAGERS[os_name] ||
+                    'unknown'
             end
             return @os_package_manager
         end
@@ -691,11 +689,8 @@ def resolve_os_packages(dependencies)
                 end
 
                 if result.empty?
-                    if self.class.supported_operating_system?
-                        os_names, os_versions = operating_system
-                        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(", ")})"
-                    end
-                    result = [[os_package_manager, FOUND_PACKAGES, [name]]]
+                    os_names, os_versions = operating_system
+                    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(", ")})"
                 end
 
                 result.each do |handler, status, packages|
@@ -763,8 +758,6 @@ def availability_of(name)
             if resolved.empty?
                 if !operating_system
                     return UNKNOWN_OS
-                elsif !supported_operating_system?
-                    return AVAILABLE
                 else return WRONG_OS
                 end
             end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "2.0.0.rc14"
+    VERSION = "2.0.0.rc15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc14
+  version: 2.0.0.rc15
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
@@ -292,3 +292,4 @@ signing_key:
 specification_version: 4
 summary: Easy installation and management of sets of software packages
 test_files: []
+has_rdoc: