bin/autoproj_bootstrap in autoproj-1.9.0.rc2 vs bin/autoproj_bootstrap in autoproj-1.9.0.rc3

@@ -1811,11 +1811,13 @@
     @shell_helpers = true
 
     # Create the env.sh script in +subdir+. In general, +subdir+ should be nil.
     def self.export_env_sh(subdir = nil)
         # Make sure that we have the environment of all selected packages
-        Autoproj.manifest.all_selected_packages.each do |pkg_name|
-            Autobuild::Package[pkg_name].update_environment
+        if Autoproj.manifest # we don't have a manifest if we are bootstrapping
+            Autoproj.manifest.all_selected_packages.each do |pkg_name|
+                Autobuild::Package[pkg_name].update_environment
+            end
         end
 
         filename = if subdir
                File.join(Autoproj.root_dir, subdir, ENV_FILENAME)
            else