Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	15 Feb 2003 23:59:16 -0000	1.12
+++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl	17 Feb 2003 23:04:57 -0000	1.13
@@ -155,7 +155,9 @@
 } {
     array set filename_info {}
 
-    set regexp_pattern "(?i)(\[^/\]+)/catalog/(.*)\\1\\.(\[a-z\]{2}_\[a-z\]{2})\\.(\[^.\]+)\\.xml\$"
+    # Catalog filepaths are on the form
+    # package_key/catalog/optional_prefix_package_key.language.country.charset.xml
+    set regexp_pattern "(?i)(\[^/\]+)/catalog/(.*)\\1\\.(\[a-z\]{2,3}_\[a-z\]{2})\\.(\[^.\]+)\\.xml\$"
     if { ![regexp $regexp_pattern $file_path match package_key prefix locale charset] } {
         return [list]
     }