autoproj 1.5.0 → 1.5.1

data/History.txt

@@ -1,3 +1,7 @@
+= Version 1.5.1
+ * --no-osdeps disables updating autobuild and autoproj, as it should
+ * fixed checking out modules that are not yet checked out
+ 
 = Version 1.5.0
  * the "clean up this  mess" release. Autoproj's main logic is now properly
    split into separate methods instead of being all in a monolitic bin/autoproj

data/lib/autoproj/cmdline.rb

@@ -39,9 +39,26 @@ module Autoproj
 
             manifest_path = File.join(Autoproj.config_dir, 'manifest')
             Autoproj.manifest = Manifest.load(manifest_path)
+
+            # Once thing left to do: handle the Autoproj.auto_update
+            # configuration parameter. This has to be done here as the rest of
+            # the configuration update/loading procedure rely on it.
+            #
+            # Namely, we must check if Autobuild.do_update has been explicitely
+            # set to true or false. If that is the case, don't do anything.
+            # Otherwise, set it to the value of auto_update (set in the
+            # manifest)
+            if Autobuild.do_update.nil?
+                Autobuild.do_update = manifest.auto_update?
+            end
+            if Autoproj::CmdLine.update_os_dependencies.nil?
+                Autoproj::CmdLine.update_os_dependencies = manifest.auto_update?
+            end
         end
 
         def self.update_myself
+            return if !Autoproj::CmdLine.update_os_dependencies?
+
             # First things first, see if we need to update ourselves
             osdeps = Autoproj::OSDependencies.load_default
             if osdeps.install(%w{autobuild autoproj})
@@ -92,20 +109,6 @@ module Autoproj
         def self.update_configuration
             manifest = Autoproj.manifest
 
-            # Once thing left to do: handle the Autoproj.auto_update
-            # configuration parameter
-            #
-            # Namely, we must check if Autobuild.do_update has been explicitely
-            # set to true or false. If that is the case, don't do anything.
-            # Otherwise, set it to the value of auto_update (set in the
-            # manifest)
-            if Autobuild.do_update.nil?
-                Autobuild.do_update = manifest.auto_update?
-            end
-            if Autoproj::CmdLine.update_os_dependencies.nil?
-                Autoproj::CmdLine.update_os_dependencies = manifest.auto_update?
-            end
-
             # Load the installation's manifest a first time, to check if we should
             # update it ... We assume that the OS dependencies for this VCS is already
             # installed (i.e. that the user did not remove it)
@@ -284,7 +287,7 @@ module Autoproj
                 current_packages.each do |pkg|
                     # If the package has no importer, the source directory must
                     # be there
-                    if !File.directory?(pkg.srcdir)
+                    if !pkg.importer && !File.directory?(pkg.srcdir)
                         raise ConfigError, "#{pkg.name} has no VCS, but is not checked out in #{pkg.srcdir}"
                     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 +02:00
+date: 2010-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency