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 -N -r1.109.2.11 -r1.109.2.12
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	12 Sep 2016 11:10:05 -0000	1.109.2.11
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl	22 Sep 2016 17:28:07 -0000	1.109.2.12
@@ -1276,19 +1276,15 @@
                 apm_callback_and_log $callback "<ul>\n"
                 set ul_p 1
             }
-            apm_callback_and_log $callback "<li>Loading data model $path/$file_path...
-<blockquote><pre>
-"
+            apm_callback_and_log $callback "<li>Loading data model $path/$file_path...\n<blockquote><pre>\n"
             db_source_sql_file -callback $callback $path/$file_path
             apm_callback_and_log $callback "</pre></blockquote>\n"
         } elseif { $file_type eq "sqlj_code" } {
             if { !$ul_p } {
                 apm_callback_and_log $callback "<ul>\n"
                 set ul_p 1
             }
-            apm_callback_and_log $callback "<li>Loading SQLJ code $path/$file_path...
-<blockquote><pre>
-"
+            apm_callback_and_log $callback "<li>Loading SQLJ code $path/$file_path...\n<blockquote><pre>\n"
             db_source_sqlj_file -callback $callback "$path/$file_path"
             apm_callback_and_log $callback "</pre></blockquote>\n"
         } elseif {$file_type eq "ctl_file"} {
@@ -1297,8 +1293,7 @@
                 apm_callback_and_log $callback "<ul>\n"
                 set ul_p 1
             }
-            apm_callback_and_log $callback "<li>Loading data file $path/$file_path...
-<blockquote><pre>"
+            apm_callback_and_log $callback "<li>Loading data file $path/$file_path...\n<blockquote><pre>\n"
             db_load_sql_data -callback $callback $path/$file_path
             apm_callback_and_log $callback "</pre></blockquote>\n"
         }
@@ -2014,11 +2009,15 @@
     # This will be a list of array-lists of packages available for install
     upvar 1 $array repository
 
+    #ns_log notice "apm_get_package_repository repository_url=$repository_url"
+    
     apm_get_installed_versions -array installed_version
 
     if { $repository_url ne "" } {
         set manifest_url "${repository_url}manifest.xml"
 
+        #ns_log notice "apm_get_package_repository manifest_url=$manifest_url"
+        
         # See if we already have it in a client property
         set manifest [ad_get_client_property acs-admin [string range $manifest_url end-49 end]]
 
@@ -2157,6 +2156,7 @@
 } {
     set result [util::http::get -url $repository_url]
     set status [dict get $result status]
+    #ns_log notice "GOT\n$repository_url\n[dict get $result page]"
     if {$status != 200} {
         return -code error "unexpected result code $status from url $repository_url"
     }