Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v diff -u -r1.109.2.1 -r1.109.2.2 --- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 17 Aug 2015 17:45:03 -0000 1.109.2.1 +++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 2 Sep 2015 09:41:06 -0000 1.109.2.2 @@ -976,7 +976,7 @@ apm_callback_and_log $callback "

Mounted an instance of the package at /${priority_mount_path}

" } { # Another package is mounted at the path so we cannot mount - set error_text "Package $version(package-name) could not be mounted at /$version(auto-mount) , there may already be a package mounted there, the error is: $error" + set error_text "Package $version(package-name) could not be mounted at /$version(auto-mount) , there may already be a package mounted there, the error is: $error" ns_log Error "apm_package_install: $error_text \n\n$::errorInfo" apm_callback_and_log $callback "

$error_text

" } @@ -990,7 +990,8 @@ } } else { # After upgrade Tcl proc callback - apm_invoke_callback_proc -version_id $version_id -type after-upgrade -arg_list [list from_version_name $upgrade_from_version_name to_version_name $version(name)] + apm_invoke_callback_proc -version_id $version_id -type after-upgrade \ + -arg_list [list from_version_name $upgrade_from_version_name to_version_name $version(name)] } # Flush the installed_p cache @@ -1002,7 +1003,7 @@ ad_proc apm_unregister_disinherited_params { package_key dependency_id } { Remove parameters for package_key that have been disinherited (i.e., the - dependency that caused them to be inherited have been removed). Called only + dependency that caused them to be inherited have been removed). Called only by the APM and keep it that way, please. } { Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -r1.118.2.1 -r1.118.2.2 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 17 Aug 2015 17:45:04 -0000 1.118.2.1 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 2 Sep 2015 09:39:59 -0000 1.118.2.2 @@ -225,8 +225,8 @@ # Shortcut to allow registering filter for all methods. Just # call ad_register_proc again, with each of the three methods. foreach method { GET POST HEAD } { - ad_register_proc -debug $debug -noinherit $noinherit $method $path $proc $arg - } + ad_register_proc -debug $debug -noinherit $noinherit $method $path $proc $arg + } return }