autoproj 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc64d6f9ced9d44cb201ab31f5dbf2a84bdef777
-  data.tar.gz: ea6d4f3c3d2db15a084c9d3348780dddd893d975
+  metadata.gz: 7e2ee9fe300a30429ca7c12afca958058d50c689
+  data.tar.gz: 7e11b16b835b22a248aeb7400c231104581fc58b
 SHA512:
-  metadata.gz: b3b99d765575bc4526854ec74f3571b41181d30267f2b223a3e7e6e3a7f1194680fd0a9d99d86ab7489e20f7030a8373b7984e0dd23178e722dd7a4f2b21b52a
-  data.tar.gz: 03740b0613ed3fcbd37b585c86d4c47decf8a8792d7f2898ccea2f79b8e0fcd765b83b2ad0d5669e9bf05339b07fa2da74697172d7b25e1f61fe964059b0940a
+  metadata.gz: e59714a1e7b66b5303035f73e44bd25c6a7e9af7bbd449f3f4db014c4eb283835ab2e305c38c2063c1fb2726a8abcffd85d25e07b91cc9e0247fe58d5b23c583
+  data.tar.gz: f9f6ea4a2ef29ac7ca513a5ec9fa522a4d367e35ac23b17e34c5977d8104ed9b9fc079c8e058bd682fed3ccb52e0c0bf7adfb5aa3104ccc63c1b16569f3b9e0f

data/lib/autoproj/ops/main_config_switcher.rb

@@ -60,12 +60,12 @@ module Autoproj
                 if current_root = ENV['AUTOPROJ_CURRENT_ROOT']
                     # Allow having a current root only if it is being reused
                     if (current_root != root_dir) && !reuse.include?(current_root)
-                        Autoproj.error "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
-                        Autoproj.error "start a new shell and try to bootstrap again"
-                        Autoproj.error
-                        Autoproj.error "you are allowed to boostrap from another autoproj installation"
-                        Autoproj.error "only if you reuse it with the --reuse flag"
-                        raise ConfigError
+                        Autobuild.error "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
+                        Autobuild.error "start a new shell and try to bootstrap again"
+                        Autobuild.error
+                        Autobuild.error "you are allowed to boostrap from another autoproj installation"
+                        Autobuild.error "only if you reuse it with the --reuse flag"
+                        raise Autobuild::Exception, ""
                     end
                 end
             end
@@ -98,14 +98,13 @@ module Autoproj
                 Autobuild.srcdir  = Autoproj.root_dir
                 Autobuild.logdir = File.join(Autobuild.prefix, 'log')
 
-                Autoproj.manifest = Manifest.new
+                manifest = Autoproj.manifest = Manifest.new
                 Tools.load_autoprojrc
                 Autoproj.prepare_environment
 
                 Autoproj::OSDependencies.define_osdeps_mode_option
-                osdeps = Autoproj::OSDependencies.load_default
-                osdeps.osdeps_mode
-                Autoproj.osdeps = osdeps
+                manifest.osdeps.load_default
+                manifest.osdeps.osdeps_mode
 
                 CmdLine.update_myself :force => true, :restart_on_update => false
                 Autoproj.change_option 'reused_autoproj_installations', reuse, true

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.12.0"
+    VERSION = "1.12.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Rock Core Developers