autoproj 1.9.5 → 1.9.6

data/bin/autoproj_bootstrap

@@ -10,6 +10,12 @@ if defined? Encoding # This is a 1.9-only thing
     Encoding.default_external = Encoding::UTF_8
 end
 
+if ENV['AUTOPROJ_CURRENT_ROOT'] && ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd
+    STDERR.puts "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
+    STDERR.puts "start a new shell and try to bootstrap again"
+    exit 1
+end
+
 require 'rbconfig'
 module Autobuild
     @windows = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
@@ -1512,7 +1518,7 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
                 when 'gem'  then modes << 'gem'
                 when 'pip'  then modes << 'pip'
                 when 'os'   then modes << 'os'
-                when 'none' then modes << 'none'
+                when 'none' then
                 else raise ArgumentError, "#{str} is not a known package handler"
                 end
             end
@@ -1589,7 +1595,10 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             options =
                 if Kernel.respond_to?(:validate_options)
                     Kernel.validate_options options, :osdeps_mode => osdeps_mode
-                else options.dup
+                else
+                    options = options.dup
+                    options[:osdeps_mode] ||= osdeps_mode
+                    options
                 end
 
             os_package_handler.enabled = false
@@ -1599,8 +1608,10 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             options[:osdeps_mode].each do |m|
                 if m == 'os'
                     os_package_handler.enabled = true
+                elsif pkg = package_handlers[m]
+                    pkg.enabled = true
                 else
-                    package_handlers[m].enabled = true
+                    Autoproj.warn "osdep handler #{m.inspect} has no handler, available handlers are #{package_handlers.keys.map(&:inspect).sort.join(", ")}"
                 end
             end
             os_package_handler.silent = self.silent?

data/bin/autoproj_bootstrap.in

@@ -10,6 +10,12 @@ if defined? Encoding # This is a 1.9-only thing
     Encoding.default_external = Encoding::UTF_8
 end
 
+if ENV['AUTOPROJ_CURRENT_ROOT'] && ENV['AUTOPROJ_CURRENT_ROOT'] != Dir.pwd
+    STDERR.puts "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
+    STDERR.puts "start a new shell and try to bootstrap again"
+    exit 1
+end
+
 require 'rbconfig'
 module Autobuild
     @windows = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!

data/lib/autoproj/osdeps.rb

@@ -1394,7 +1394,7 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
                 when 'gem'  then modes << 'gem'
                 when 'pip'  then modes << 'pip'
                 when 'os'   then modes << 'os'
-                when 'none' then modes << 'none'
+                when 'none' then
                 else raise ArgumentError, "#{str} is not a known package handler"
                 end
             end
@@ -1471,7 +1471,10 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             options =
                 if Kernel.respond_to?(:validate_options)
                     Kernel.validate_options options, :osdeps_mode => osdeps_mode
-                else options.dup
+                else
+                    options = options.dup
+                    options[:osdeps_mode] ||= osdeps_mode
+                    options
                 end
 
             os_package_handler.enabled = false
@@ -1481,8 +1484,10 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
             options[:osdeps_mode].each do |m|
                 if m == 'os'
                     os_package_handler.enabled = true
+                elsif pkg = package_handlers[m]
+                    pkg.enabled = true
                 else
-                    package_handlers[m].enabled = true
+                    Autoproj.warn "osdep handler #{m.inspect} has no handler, available handlers are #{package_handlers.keys.map(&:inspect).sort.join(", ")}"
                 end
             end
             os_package_handler.silent = self.silent?

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.5"
+    VERSION = "1.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild