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.148.2.52 -r1.148.2.53
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	15 Mar 2022 12:01:53 -0000	1.148.2.52
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	29 Mar 2022 16:07:07 -0000	1.148.2.53
@@ -1029,16 +1029,11 @@
   }
 
   require proc package {package_key} {
-    if {![info exists :required_package($package_key)]} {
-      foreach path [apm_get_package_files \
-                        -package_key $package_key \
-                        -file_types tcl_procs] {
-        # 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::rootdir/packages/$package_key/$path"
-      }
-      set :required_package($package_key) 1
+    foreach path [apm_get_package_files \
+                      -package_key $package_key \
+                      -file_types tcl_procs] {
+      ::xo::library -package $package_key \
+          [file name [file tail $path]]
     }
   }