Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	27 Sep 2007 10:40:48 -0000	1.39
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	28 Sep 2007 07:41:23 -0000	1.40
@@ -110,7 +110,10 @@
       foreach path [apm_get_package_files \
 			-package_key $package_key \
 			-file_types tcl_procs] {
-	uplevel #1 source "[acs_root_dir]/packages/$package_key/$path"
+        # Use apm_source instead of source to prevent double
+        # sourcing by the apm_loader (temporary solution, double
+        # sourcing should no happen)
+	uplevel #1 apm_source "[acs_root_dir]/packages/$package_key/$path"
       }
       my set required_package($package_key) 1
     }