Index: openacs-4/packages/acs-admin/www/apm/build-repository.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/build-repository.tcl,v
diff -u -N -r1.18 -r1.18.2.1
--- openacs-4/packages/acs-admin/www/apm/build-repository.tcl	27 Jun 2015 16:41:07 -0000	1.18
+++ openacs-4/packages/acs-admin/www/apm/build-repository.tcl	18 Aug 2015 12:29:11 -0000	1.18.2.1
@@ -253,8 +253,7 @@
                     append manifest {  } {</package>} \n
                 } 
             } {
-                global errorInfo
-                ns_write "<li> Error on spec_file $spec_file: [ad_quotehtml $errmsg]<br>[ad_quotehtml $errorInfo]\n"
+                ns_write "<li> Error on spec_file $spec_file: [ad_quotehtml $errmsg]<br>[ad_quotehtml $::errorInfo]\n"
             }
         }
     }
Index: openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl	27 Jun 2015 16:41:07 -0000	1.5
+++ openacs-4/packages/acs-admin/www/apm/version-callback-invoke.tcl	18 Aug 2015 12:29:11 -0000	1.5.2.1
@@ -24,8 +24,7 @@
                  [list $return_url "Tcl Callbacks"] $page_title]
 
 if { [catch $proc_value result] } {
-    global errorInfo
-    ns_log Error "Error invoking callback $proc_value: $result\n$errorInfo"
+    ns_log Error "Error invoking callback $proc_value: $result\n$::errorInfo"
 }
 
 
Index: openacs-4/packages/acs-admin/www/apm/version-generate-diffs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-generate-diffs.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-admin/www/apm/version-generate-diffs.tcl	13 Jun 2015 23:55:32 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/version-generate-diffs.tcl	18 Aug 2015 12:29:11 -0000	1.4.2.1
@@ -29,8 +29,6 @@
 
 set no_changes [list]
 
-global errorCode
-
 foreach file [apm_get_package_files -package_key $package_key] {
     if { ![file isfile "[acs_root_dir]/$file"] } {
 	doc_body_append "<h3>$file</h3>\n<blockquote>This file has been locally added.</blockquote>\n"
@@ -50,7 +48,7 @@
     if { $errno == 0 } {
 	lappend no_changes $file
     } else {
-	set status [lindex $errorCode 2]
+	set status [lindex $::errorCode 2]
 	if { $status == 1 } {
 	    regsub {child process exited abnormally$} $diffs "" diffs
 	    doc_body_append "<h3>$file</h3>\n<blockquote><pre>[ns_quotehtml $diffs]</pre></blockquote>\n"
Index: openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl,v
diff -u -N -r1.89 -r1.89.2.1
--- openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	16 Jun 2015 07:13:27 -0000	1.89
+++ openacs-4/packages/acs-authentication/tcl/authentication-procs.tcl	18 Aug 2015 12:22:04 -0000	1.89.2.1
@@ -241,8 +241,7 @@
     } {
         set result(auth_status) failed_to_connect
         set result(auth_message) $errmsg
-        global errorInfo
-        ns_log Error "auth::authenticate: error invoking authentication driver for authority_id = $authority_id: $errorInfo"
+        ns_log Error "auth::authenticate: error invoking authentication driver for authority_id = $authority_id: $::errorInfo"
     }
 
     # Returns:
@@ -1061,8 +1060,7 @@
 
     } on_error {
         # we got an error.  log it and signal failure.
-        global errorInfo
-        ns_log Error "Problem creating a new user: $errorInfo"
+        ns_log Error "Problem creating a new user: $::errorInfo"
         set error_p 1
     }
     
@@ -1197,8 +1195,7 @@
     if { $error_p } {
         set result(update_status) "failed_to_connect"
         set result(update_message) [_ acs-subsite.Error_update_account_info]
-        global errorInfo
-        ns_log Error "Error updating local account.\n$errorInfo"
+        ns_log Error "Error updating local account.\n$::errorInfo"
         return [array get result]
     }
 
@@ -1434,8 +1431,7 @@
                     with_catch errmsg {
                         auth::send_email_verification_email -user_id $user_id
                     } {
-                        global errorInfo
-                        ns_log Error "auth::check_local_account_status: Error sending out email verification email to email $email:\n$errorInfo"
+                        ns_log Error "auth::check_local_account_status: Error sending out email verification email to email $email:\n$::errorInfo"
                         set result(account_message) [_ acs-subsite.Error_sending_verification_mail]
                     }
                 }
Index: openacs-4/packages/acs-authentication/tcl/authority-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/authority-procs.tcl,v
diff -u -N -r1.29 -r1.29.2.1
--- openacs-4/packages/acs-authentication/tcl/authority-procs.tcl	27 Oct 2014 16:39:01 -0000	1.29
+++ openacs-4/packages/acs-authentication/tcl/authority-procs.tcl	18 Aug 2015 12:22:04 -0000	1.29.2.1
@@ -326,8 +326,7 @@
         with_catch errmsg {
             array set doc_result [auth::sync::GetDocument -authority_id $authority_id]
         } {
-            global errorInfo
-            ns_log Error "Error getting sync document:\n$errorInfo"
+            ns_log Error "Error getting sync document:\n$::errorInfo"
             set doc_result(doc_status) failed_to_connect
             set doc_result(doc_message) $errmsg
         }
@@ -373,8 +372,7 @@
                         $ack_doc
                 }
             } {
-                global errorInfo
-                ns_log Error "Error processing sync document:\n$errorInfo"
+                ns_log Error "Error processing sync document:\n$::errorInfo"
                 set message "Error processing sync document: $errmsg"
             }
         } else {
Index: openacs-4/packages/acs-authentication/tcl/driver-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/driver-procs.tcl,v
diff -u -N -r1.7 -r1.7.12.1
--- openacs-4/packages/acs-authentication/tcl/driver-procs.tcl	10 Jan 2007 21:22:01 -0000	1.7
+++ openacs-4/packages/acs-authentication/tcl/driver-procs.tcl	18 Aug 2015 12:22:04 -0000	1.7.12.1
@@ -37,8 +37,7 @@
                             -impl_id $impl_id \
                             -operation GetParameters]
     } {
-        global errorInfo
-        ns_log Error "Error getting parameters for impl_id $impl_id: $errmsg\n$errorInfo"
+        ns_log Error "Error getting parameters for impl_id $impl_id: $errmsg\n$::errorInfo"
     }
     return $parameters
 }
Index: openacs-4/packages/acs-authentication/tcl/local-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/local-procs.tcl,v
diff -u -N -r1.39 -r1.39.2.1
--- openacs-4/packages/acs-authentication/tcl/local-procs.tcl	16 Jun 2015 07:13:27 -0000	1.39
+++ openacs-4/packages/acs-authentication/tcl/local-procs.tcl	18 Aug 2015 12:22:04 -0000	1.39.2.1
@@ -278,8 +278,7 @@
 
     if { [catch { ad_change_password $user_id $new_password } errmsg] } {
         set result(password_status) "change_error"
-        global errorInfo
-        ns_log Error "Error changing local password for username $username, user_id $user_id: \n$errorInfo"
+        ns_log Error "Error changing local password for username $username, user_id $user_id: \n$::errorInfo"
         return [array get result]
     }
 
@@ -311,8 +310,7 @@
             -subject $subject \
             -body $body
 	} {
-            global errorInfo
-            ns_log Error "Error sending out password changed notification to account owner with user_id $user(user_id), email $user(email): $errmsg\n$errorInfo"
+            ns_log Error "Error sending out password changed notification to account owner with user_id $user(user_id), email $user(email): $errmsg\n$::errorInfo"
 	}
     }
     
@@ -516,8 +514,7 @@
 		    -body_msg_key "acs-subsite.email_body_Registration_password" 
 	    } {
 		# We don't fail hard here, just log an error
-		global errorInfo
-		ns_log Error "Error sending registration confirmation to $email.\n$errorInfo"
+		ns_log Error "Error sending registration confirmation to $email.\n$::errorInfo"
 	    }
 	}
     }
@@ -547,8 +544,7 @@
                 -body [lang::message::lookup $admin_locale acs-subsite.lt_first_names_last_name]
         } {
             # We don't fail hard here, just log an error
-            global errorInfo
-            ns_log Error "Error sending admin notification to $admin_email.\n$errorInfo"
+            ns_log Error "Error sending admin notification to $admin_email.\n$::errorInfo"
         }
     }
 
Index: openacs-4/packages/acs-authentication/tcl/password-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/password-procs.tcl,v
diff -u -N -r1.19 -r1.19.2.1
--- openacs-4/packages/acs-authentication/tcl/password-procs.tcl	27 Oct 2014 16:39:01 -0000	1.19
+++ openacs-4/packages/acs-authentication/tcl/password-procs.tcl	18 Aug 2015 12:22:04 -0000	1.19.2.1
@@ -64,8 +64,7 @@
     with_catch errmsg { 
         set result_p [auth::password::CanChangePassword -authority_id $authority_id]
     } {
-        global errorInfo
-        ns_log Error "Error invoking CanChangePassword operation for authority_id $authority_id:\n$errorInfo"
+        ns_log Error "Error invoking CanChangePassword operation for authority_id $authority_id:\n$::errorInfo"
     }
     return $result_p
 }
@@ -109,8 +108,7 @@
     } {
         set result(password_status) failed_to_connect
         set result(password_message) $errmsg
-        global errorInfo
-        ns_log Error "Error invoking password management driver for authority_id = $user(authority_id):\n$errorInfo"
+        ns_log Error "Error invoking password management driver for authority_id = $user(authority_id):\n$::errorInfo"
     }
     
     # Check the result code and provide canned responses
@@ -295,8 +293,7 @@
         set result_p [auth::password::CanRetrievePassword \
                     -authority_id $authority_id]
     } {
-        global errorInfo
-        ns_log Error "Error invoking CanRetrievePassword operation for authority_id $authority_id:\n$errorInfo"
+        ns_log Error "Error invoking CanRetrievePassword operation for authority_id $authority_id:\n$::errorInfo"
         return 0
     }
     return $result_p
@@ -337,8 +334,7 @@
     } {
         set result(password_status) failed_to_connect
         set result(password_message) "Error invoking the password management driver."
-        global errorInfo
-        ns_log Error "Error invoking password management driver for authority_id = $authority_id: $errorInfo"
+        ns_log Error "Error invoking password management driver for authority_id = $authority_id: $::errorInfo"
     }
     
     # Check the result code and provide canned responses
@@ -357,8 +353,7 @@
                     # We could not inform the user of his email - we failed
                     set result(password_status) "failed_to_connect"
                     set result(password_message) [_ acs-subsite.Error_sending_mail]
-                    global errorInfo
-                    ns_log Error "We had an error sending out email with new password to username $username, authority $authority_id:\n$errorInfo"
+                    ns_log Error "We had an error sending out email with new password to username $username, authority $authority_id:\n$::errorInfo"
                 }
             } 
             if { ![info exists result(password_message)] || $result(password_message) eq "" } {
@@ -399,8 +394,7 @@
         set result_p [auth::password::CanResetPassword \
                     -authority_id $authority_id]
     } {
-        global errorInfo
-        ns_log Error "Error invoking CanResetPassword operation for authority_id $authority_id:\n$errorInfo"
+        ns_log Error "Error invoking CanResetPassword operation for authority_id $authority_id:\n$::errorInfo"
     }
     return $result_p
 }
@@ -472,8 +466,7 @@
                     # We could not inform the user of his email - we failed
                     set result(password_status) "failed_to_connect"
                     set result(password_message) [_ acs-subsite.Error_sending_mail]
-                    global errorInfo
-                    ns_log Error "We had an error sending out email with new password to username $username, authority $authority_id:\n$errorInfo"
+                    ns_log Error "We had an error sending out email with new password to username $username, authority $authority_id:\n$::errorInfo"
                 }
             }
             if { ![info exists result(password_message)] || $result(password_message) eq "" } {
Index: openacs-4/packages/acs-authentication/tcl/sync-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/tcl/sync-procs.tcl,v
diff -u -N -r1.35 -r1.35.2.1
--- openacs-4/packages/acs-authentication/tcl/sync-procs.tcl	27 Oct 2014 16:39:01 -0000	1.35
+++ openacs-4/packages/acs-authentication/tcl/sync-procs.tcl	18 Aug 2015 12:22:04 -0000	1.35.2.1
@@ -194,8 +194,7 @@
 To view the complete log, please visit\n$job(log_url)"
         } {
             # We don't fail hard here, just log an error
-            global errorInfo
-            ns_log Error "Error sending registration confirmation to [ad_system_owner].\n$errorInfo"
+            ns_log Error "Error sending registration confirmation to [ad_system_owner].\n$::errorInfo"
         }
     }
     
@@ -455,10 +454,9 @@
                 }
             } {
                 # Get errorInfo and log it
-                global errorInfo
-                ns_log Error "Error during batch syncrhonization job:\n$errorInfo"
+                ns_log Error "Error during batch syncrhonization job:\n$::errorInfo"
                 set success_p 0
-                set result(message) $errorInfo
+                set result(message) $::errorInfo
             }
         }
 
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 -N -r1.32 -r1.32.2.1
--- 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	18 Aug 2015 12:27:15 -0000	1.32.2.1
@@ -186,7 +186,7 @@
     # 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"  } {
Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v
diff -u -N -r1.25 -r1.25.2.1
--- openacs-4/packages/acs-bootstrap-installer/installer.tcl	27 Oct 2014 16:39:04 -0000	1.25
+++ openacs-4/packages/acs-bootstrap-installer/installer.tcl	18 Aug 2015 12:27:15 -0000	1.25.2.1
@@ -298,9 +298,8 @@
     } error] } {
         # In case of an error, don't forget to unlock the mutex.
         ns_mutex unlock [nsv_get acs_installer mutex]
-        global errorInfo
         install_return 500 "Error" "The following error occurred in an installation script:\n\
-        <blockquote><pre>[ns_quotehtml $errorInfo]</pre></blockquote>\n"
+        <blockquote><pre>[ns_quotehtml $::errorInfo]</pre></blockquote>\n"
     }
     if {[array size errors] > 0} {
         install_return 500 "Error" [install_load_errors_formatted errors]
@@ -359,9 +358,9 @@
     set result ""
     if {[array size errors] > 0} {
         append result "<blockquote><pre>\n"
-        foreach {package errorInfos} [array get errors] {
+        foreach {package error_infos} [array get errors] {
             append result "<h4>Error in Package $package:</h4>\n"
-            foreach {fileName backTrace} $errorInfos {
+            foreach {fileName backTrace} $error_infos {
                 append result "<strong>Error in File $fileName</strong>\n\n[ad_quotehtml $backTrace]\n\n\n"
             }
         }
Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v
diff -u -N -r1.50 -r1.50.2.1
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	27 Oct 2014 16:39:37 -0000	1.50
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl	18 Aug 2015 12:31:30 -0000	1.50.2.1
@@ -606,8 +606,7 @@
                     -message_key $message_key \
                     -description $descriptions_array($message_key)
             } {
-                global errorInfo
-                ns_log Error "Registering description for key ${package_key}.${message_key} in locale $locale failed with error message \"$errmsg\"\n\n$errorInfo"
+                ns_log Error "Registering description for key ${package_key}.${message_key} in locale $locale failed with error message \"$errmsg\"\n\n$::errorInfo"
             }
         }    
     }
@@ -1023,9 +1022,8 @@
             # Use a catch so that parse failure of one file doesn't cause the import of all files to fail
             array unset loop_message_count
             if { [catch { array set loop_message_count [lang::catalog::import_from_file $file_path] } errMsg] } {
-                global errorInfo
                 
-                ns_log Error "The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$errorInfo\n\n"
+                ns_log Error "The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$::errorInfo\n\n"
             } else {
                 foreach action [array names loop_message_count] {
                     if { $action ne "errors" } {
Index: openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl,v
diff -u -N -r1.18 -r1.18.2.1
--- openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	27 Oct 2014 16:39:38 -0000	1.18
+++ openacs-4/packages/acs-lang/tcl/test/acs-lang-test-procs.tcl	18 Aug 2015 12:31:30 -0000	1.18.2.1
@@ -765,9 +765,7 @@
         
     } {
         parameter::set_value -parameter UsePackageLevelLocalesP -package_id [apm_package_id_from_key "acs-lang"] -value $use_package_level_locales_p_org
-        
-        global errorInfo
-        error $errmsg $errorInfo
+        error $errmsg $::errorInfo
     }
 
     parameter::set_value -parameter UsePackageLevelLocalesP -package_id [apm_package_id_from_key "acs-lang"] -value $use_package_level_locales_p_org
@@ -902,8 +900,7 @@
 
         if { $error_p } {
             # rethrow the error
-            global errorInfo
-            error $errmsg $errorInfo
+            error $errmsg $::errorInfo
         }
     }
 }
@@ -967,8 +964,7 @@
             $gb_message
     } {
         set error_p 1
-        global errorInfo
-        set saved_errorInfo $errorInfo
+        set saved_errorInfo $::errorInfo
     }
 
     # Clean up
Index: openacs-4/packages/acs-lang/www/admin/lookups-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/lookups-include.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-lang/www/admin/lookups-include.tcl	27 Oct 2014 16:39:39 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/lookups-include.tcl	18 Aug 2015 12:31:30 -0000	1.4.2.1
@@ -4,8 +4,7 @@
 
 set message_key_context ""
 if { [catch {set message_key_context [exec find $::acs::rootdir -type f -regex ".*\\.\\(info\\|adp\\|sql\\|tcl\\)" | xargs egrep "${full_key_pattern}"]} error] } {
-    global errorInfo
-    regexp "^(.*)child process exited abnormally" $errorInfo match message_key_context
+    regexp "^(.*)child process exited abnormally" $::errorInfo match message_key_context
     set message_key_context [ad_quotehtml $message_key_context]
     regsub -all "${full_key_pattern}" $message_key_context {<b>\0</b>} message_key_context
 }
Index: openacs-4/packages/acs-lang/www/admin/message-usage-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-usage-include.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-lang/www/admin/message-usage-include.tcl	27 Oct 2014 16:39:39 -0000	1.6
+++ openacs-4/packages/acs-lang/www/admin/message-usage-include.tcl	18 Aug 2015 12:31:30 -0000	1.6.2.1
@@ -21,7 +21,6 @@
     exec find $::acs::rootdir -type f -regex ".*\\.\\(info\\|adp\\|sql\\|tcl\\)" -follow | xargs egrep "$grepfor" 2>/dev/null
 } {
     #error "find $::acs::rootdir -type f -regex \".*\\.\\(info\\|adp\\|sql\\|tcl\\)\" -follow | xargs egrep \"${full_key_pattern}\""
-    global errorInfo
 
     foreach line [split $errmsg "\n"] {
         if { [string first "child process exited abnormally" $line] == -1 } {
Index: openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl,v
diff -u -N -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl	27 Oct 2014 16:39:40 -0000	1.11
+++ openacs-4/packages/acs-lang/www/admin/set-system-timezone.tcl	18 Aug 2015 12:31:30 -0000	1.11.2.1
@@ -129,7 +129,6 @@
         }
     } {
         # Didn't work, too bad
-        global errorInfo
-        error $errmsg $errorInfo
+        error $errmsg $::errorInfo
     }
 }