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.17 -r1.18
--- openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	14 Jan 2003 12:21:04 -0000	1.17
+++ openacs-4/packages/acs-bootstrap-installer/bootstrap.tcl	21 Jan 2003 11:48:50 -0000	1.18
@@ -124,19 +124,9 @@
     # Load the Tcl package init files.
     apm_bootstrap_load_libraries -init acs-tcl
 
-    #
-    # Check for the presence of the automated testing package.
-    #
-    set load_tests_p [apm_load_tests_p]
+    # Load libraries, queries etc. for remaining packages
+    apm_load_packages
 
-    foreach package_key [db_list package_keys_select {
-	select package_key from apm_enabled_package_versions
-    }] {
-        nsv_set apm_enabled_package $package_key 1    
-
-        apm_load_package -load_tests=$load_tests_p $package_key
-    }
-
     if { ![nsv_exists rp_properties request_count] } {
 	# security-init.tcl has not been invoked, so it's safe to say that the
 	# core has not been properly initialized and the server will probably