Index: openacs-4/packages/acs-admin/www/install/install-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-3.tcl,v
diff -u -N -r1.10.2.8 -r1.10.2.9
--- openacs-4/packages/acs-admin/www/install/install-3.tcl	28 Jul 2017 02:24:24 -0000	1.10.2.8
+++ openacs-4/packages/acs-admin/www/install/install-3.tcl	30 Jul 2017 15:20:11 -0000	1.10.2.9
@@ -89,7 +89,7 @@
     array unset version
     array set version $repository($package_key)
     
-    if { ([info exists version(download_url)] && $version(download_url) ne "") } {
+    if { [info exists version(download_url)] && $version(download_url) ne "" } {
         ns_write [subst {
             <p>Transferring $version(download_url) ...
             <script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
@@ -157,14 +157,7 @@
     
     # Install the package -- this actually copies the files into the
     # right place in the file system and backs up any old files
-    ns_log notice [list apm_package_install \
-                       -enable \
-                       -install_from_repository \
-                       -package_path $package_path \
-                       -load_data_model \
-                       -data_model_files $data_model_files \
-                       $spec_file]
-    
+
     set version_id [apm_package_install \
                         -enable \
                         -install_from_repository \
@@ -180,6 +173,11 @@
         set success_p 0
     } else {
 	ns_write "... installation OK <br>\n"
+        ns_eval [subst {
+            apm_load_libraries -procs -force_reload -packages $package_key
+            apm_load_queries -packages $package_key
+        }]
+	ns_write "... updated blueprint <br>\n"
     }
     ns_write {
 	<script nonce='$::__csp_nonce'>window.scrollTo(0,document.body.scrollHeight);</script>
@@ -191,50 +189,10 @@
 # Done
 #
 #####
-#
-# It seems, that after saving a blueprint in AOLserver, the ns_sets
-# are not available anymore, and that therefore export_vars runs into
-# problems when trying to access these variables. So, Compute the
-# continue_url before potential blueprint updates.
-#
-set continue_url [export_vars -base install-4 { repository_url success_p }]
 
-if {$success_p} {
-    #
-    # The update has finished successfully. Since all the new files
-    # were sourced, the actual connection thread is already up to
-    # date.  In order to provide this code to the other threads, it is
-    # necessary to update the internal blueprint. This works slightly
-    # different in NaviServer and AOLserver.
-    #
-    if {[info commands ::nstrace::statescript] ne ""} {
-        #
-        # NaviServer:
-        #   - nstrace::statescript produces the blueprint
-        #   - "ns_ictl  save" updates it in the server
-        #
-        ns_ictl save [nstrace::statescript]
-        
-    } elseif {[info commands ::_ns_savenamespaces] ne ""} {
-        #
-        # AOLserver: _ns_savenamespaces produces the update
-        # script and updates the blueprint
-        #
-        _ns_savenamespaces
-    }
-} else {
-    #
-    # At least one update has failed. Since it is not clear whether or
-    # not library files were sourced, it is necessary to delete this
-    # thread asap to avoid potential confusion with already updated
-    # procs.
-    #
-    ns_ictl markfordelete
+ad_progress_bar_end -url [export_vars -base install-4 { repository_url success_p }]
 
-}
-ad_progress_bar_end -url $continue_url
 
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4