Index: openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	27 Oct 2014 16:39:04 -0000	1.32
+++ openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	7 Aug 2017 23:47:46 -0000	1.33
@@ -65,7 +65,7 @@
     # Used for ns_logs:
     set proc_name {Bootstrap}
 
-    # Load the special bootstrap tcl library.
+    # Load the special bootstrap Tcl library.
 
     set files [lsort [glob -nocomplain "$::acs::rootdir/packages/acs-bootstrap-installer/tcl/*-procs.tcl"]]
     if { [llength $files] == 0 } {
@@ -128,14 +128,23 @@
     apm_bootstrap_load_queries acs-tcl
     apm_bootstrap_load_queries acs-bootstrap-installer
 
-    # Is OpenACS installation complete? If not, source the installer and bail.
+    # Is OpenACS installation complete? If not, source the installer and bail out.
     if { ![ad_verify_install] } {
-	ns_log Notice "$proc_name: Installation is not complete - sourcing the installer."
+	ns_log warning "$proc_name: Installation is not complete - sourcing the installer."
 	source "$::acs::rootdir/packages/acs-bootstrap-installer/installer.tcl"
 	source "$::acs::rootdir/packages/acs-bootstrap-installer/installer-init.tcl"
 	return
     }
+    
+    #
+    # The installation is apparently ok, we can use the database. It
+    # should not be necessary to use the [ad_acs_kernel_id] redefine
+    # trick, but to use a plain variable in the ::acs namespace.
+    #
+    set ::acs::kernel_id [ad_acs_kernel_id_mem]
+    ns_log notice "bootstrap: setting ::acs::kernel_id to $::acs::kernel_id"
 
+    #
     # Load all parameters for enabled package instances.
     # ad_parameter_cache_all  
     
@@ -146,16 +155,6 @@
     ns_log Notice "Loading acs-automated-testing specially so other packages can define tests..."
     apm_bootstrap_load_libraries -procs acs-automated-testing
 
-    # Package libraries are now loaded in dependency order, rather than
-    # alphabetically.  This code is obsolete and has been commented out
-    # for 5.7.
-
-    #if {[info commands ::xotcl::Class] ne "" &&
-    #    [file isdirectory $::acs::rootdir/packages/xotcl-core]} {
-    #   apm_bootstrap_load_libraries -procs xotcl-core
-    #   apm_bootstrap_load_libraries -init xotcl-core
-    #}
-
     # Build the list of subsite packages
     apm_build_subsite_packages_list
 
@@ -182,14 +181,20 @@
 }]
 
 if { $errno && $errno != 2 } {
-    # An error occured while bootstrapping. Handle it by registering a filter
+    # An error occurred while bootstrapping. Handle it by registering a filter
     # to display the error message, rather than leaving the site administrator
     # to guess what broke.
 
-    # If the $errorCode is "bootstrap_fatal_error", then the error was explicitly
+    # If the $::errorCode is "bootstrap_fatal_error", then the error was explicitly
     # thrown by a call to bootstrap_fatal_error. If not, bootstrap_fatal_error was
     # never called, so we need to call it now.
     if {$::errorCode ne "bootstrap_fatal_error"  } {
 	bootstrap_fatal_error "Error during bootstrapping" 0
     }
 }
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: