bin/autoproj_bootstrap in autoproj-1.8.2.b22 vs bin/autoproj_bootstrap in autoproj-1.8.2.b23

@@ -1615,9 +1615,13 @@
     # Returns the root directory of the current autoproj installation.
     #
     # If the current directory is not in an autoproj installation,
     # raises UserError.
     def self.root_dir(dir = Dir.pwd)
+        if @root_dir
+            return @root_dir
+        end
+
         while dir != "/" && !File.directory?(File.join(dir, "autoproj"))
             dir = File.dirname(dir)
         end
         if dir == "/"
             raise UserError, "not in a Autoproj installation"