Index: openacs-4/packages/acs-tcl/tcl/install-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/install-procs.tcl,v diff -u -r1.29 -r1.30 --- openacs-4/packages/acs-tcl/tcl/install-procs.tcl 31 Mar 2010 23:33:24 -0000 1.29 +++ openacs-4/packages/acs-tcl/tcl/install-procs.tcl 27 Oct 2014 16:40:07 -0000 1.30 @@ -66,11 +66,11 @@ switch -exact $type { tcl { - set code [template::util::read_file [acs_root_dir]$src] + set code [template::util::read_file $::acs::rootdir$src] set out [eval $code] } sql { - db_source_sql_file [acs_root_dir]$src + db_source_sql_file $::acs::rootdir$src set out "$src completed" } install.xml { @@ -102,6 +102,7 @@

<mount package="package-key instance-name="name" mount-point="url" />

} { + set package_key [apm_required_attribute_value $node package] set instance_name [apm_required_attribute_value $node instance-name] set id [apm_attribute_value -default "" $node id] @@ -353,7 +354,7 @@ } } - eval $command + {*}$command return } @@ -365,24 +366,25 @@ variable ::install::xml::ids set name [apm_required_attribute_value $node name] + set type [apm_attribute_value -default "literal" $node type] set value [apm_attribute_value -default {} $node value] - set package_id [install::xml::object_id::package $node] + set package_ids [install::xml::object_id::package $node] - set type [apm_attribute_value -default "literal" $node type] + foreach package_id $package_ids { + switch -- $type { + literal { + parameter::set_value -package_id $package_id \ + -parameter $name \ + -value $value + } - switch -- $type { - literal { - parameter::set_value -package_id $package_id \ - -parameter $name \ - -value $value - - } - id { - parameter::set_value -package_id $package_id \ - -parameter $name \ - -value $ids($value) - } + id { + parameter::set_value -package_id $package_id \ + -parameter $name \ + -value $ids($value) + } + } } return } @@ -436,7 +438,8 @@ } ad_proc -public install::xml::action::unset-permission { node } { - Revokes a permissions on an object - has no effect if the permission is not granted directly (ie does not act as negative permissions). + Revokes a permissions on an object - has no effect if the permission is not granted directly + (ie does not act as negative permissions).

<unset-permissions grantee="party" privilege="package-key />

} { @@ -976,7 +979,7 @@ } } - set result [eval $cmd] + set result [{*}$cmd] set id [apm_attribute_value -default "" $node id] if {$id ne ""} { set ::install::xml::ids($id) $result @@ -1053,7 +1056,7 @@ return [install::xml::util::get_id $id] } } elseif { $package_key ne "" } { - return [apm_package_id_from_key $package_key] + return [apm_package_ids_from_key -package_key $package_key] } else { return [site_node::get_object_id \