Index: openacs-4/packages/acs-tcl/tcl/apm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-procs.tcl,v
diff -u -r1.94.2.7 -r1.94.2.8
--- openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	2 Oct 2013 22:55:55 -0000	1.94.2.7
+++ openacs-4/packages/acs-tcl/tcl/apm-procs.tcl	6 Oct 2013 12:36:51 -0000	1.94.2.8
@@ -195,7 +195,7 @@
     global apm_package_url_resolution
 
     foreach package $package_list {
-        foreach {package_key dependency_type} $package {}
+	lassign $package package_key dependency_type
         if { [info exists apm_visited_package_keys($package_key)] } {
             continue
         }
@@ -235,7 +235,7 @@
 
     # Make sure old versions work ...
     foreach package $package_list {
-        foreach {package_key dependency_type} $package {}
+	lassign $package package_key dependency_type
         set inherit_templates_p t
 #fix!
         catch { db_1row get_inherit_templates_p {} }
@@ -2097,8 +2097,7 @@
     apm_parameter_sync $new_package_key $package_id
     
     foreach inherited_package_key [apm_package_inherit_order $new_package_key] {
-        if { [lsearch -exact [apm_package_inherit_order $old_package_key] $inherited_package_key]
-             == -1 } {
+        if {$inherited_package_key ni [apm_package_inherit_order $old_package_key]} {
             apm_invoke_callback_proc \
                 -package_key $inherited_package_key \
                 -type after-instantiate \