Index: openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl	27 Oct 2014 16:40:05 -0000	1.10
+++ openacs-4/packages/acs-tcl/tcl/acs-kernel-procs.tcl	7 Aug 2017 23:47:59 -0000	1.11
@@ -10,10 +10,47 @@
     @return 1 if a user with admin privileges exists, 0 otherwise.
 
 } {
-    return [db_string admin_exists_p {} -default 0]
+    ad_acs_require_basic_schemata
+    
+    return [db_string admin_exists_p {
+        select 1 as admin_exists_p
+        from dual
+        where exists (
+	   select 1
+	   from acs_permissions p,
+	        party_approved_member_map m,
+	        users u,
+	        acs_magic_objects amo
+	   where amo.name = 'security_context_root'
+	     and p.object_id = amo.object_id
+	     and p.grantee_id = m.party_id
+	     and u.user_id = m.member_id
+	     and acs_permission.permission_p(amo.object_id, u.user_id, 'admin')
+         )
+    } -default 0]
 }
 
+ad_proc -private ad_acs_require_basic_schemata {} {
 
+    This is a transitional code to ensure that the SQL schemata
+    required for botostrapping (i.e. before the upgrade script) are
+    already installed.
+
+} {
+    set schema_name "acs_permission"
+    if {![db_string has_schema {}]} {
+        set kernelSqlDir "$::acs::rootdir/packages/acs-kernel/sql/[db_driverkey {}]/upgrade"
+        set files "upgrade-5.9.1d10-5.9.1d11.sql"
+        foreach file $files {
+            set fn $kernelSqlDir/$file
+            if {[file readable $fn]} {
+                ns_log notice "bootstrap: upgrading sql file $fn"
+                db_source_sql_file -callback apm_dummy_callback $fn
+            }
+        }
+    }
+}
+
 ad_proc -public ad_acs_admin_node {} {
 
     @return The node id of the ACS administration service if it is mounted, 0 otherwise.
@@ -36,22 +73,27 @@
 ad_proc -public ad_verify_install {} {
   Returns 1 if the acs is properly installed, 0 otherwise.
 } {
-    # define util_memoize with proc here to avoid error messages about multiple 
+    # Define util_memoize with proc here to avoid error messages about multiple 
     # defines.
     if { ![db_table_exists apm_packages] || ![db_table_exists site_nodes] } {
+        ns_log warning "ad_verify_install: apm_packages [db_table_exists apm_packages] site_nodes [db_table_exists site_nodes]"
 	proc util_memoize {script {max_age ""}} {{*}$script}
 	return 0
     }
     set kernel_install_p [apm_package_installed_p acs-kernel] 
     set admin_exists_p [ad_acs_administrator_exists_p]
-
-    ns_log Debug "Verifying Installation: Kernel Installed? $kernel_install_p \
- 	    An Administrator? $admin_exists_p"
-
+    
     if { $kernel_install_p && $admin_exists_p} {
 	return 1 
     } else {
+        ns_log warning "ad_verify_install: kernel_install_p $kernel_install_p admin_exists_p $admin_exists_p"
 	proc util_memoize {script {max_age ""}} {{*}$script}
 	return 0
     }
 }
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: