Index: openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl,v diff -u -r1.11.2.8 -r1.11.2.9 --- openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 26 Oct 2013 10:55:45 -0000 1.11.2.8 +++ openacs-4/packages/acs-subsite/tcl/attribute-procs.tcl 25 Aug 2014 09:37:55 -0000 1.11.2.9 @@ -141,15 +141,15 @@ for { set i 0 } { $i < [llength $plsql] } { incr i } { set cmd [lindex $plsql $i] - if { [catch {eval $cmd} err_msg] } { + if { [catch $cmd err_msg] } { # Rollback what we've done so far. The loop contitionals are: # start at the end of the plsql_drop list (Drop things in reverse order of creation) # execute drop statements until we reach position $i+1 # This position represents the operation on which we failed, and thus # is not executed for { set inner [expr {[llength $plsql_drop] - 1}] } { $inner > $i + 1 } { set inner [expr {$inner - 1}] } { set drop_cmd [lindex $plsql_drop $inner] - if { [catch {eval $drop_cmd} err_msg_2] } { + if { [catch $drop_cmd err_msg_2] } { append err_msg "\nAdditional error while trying to roll back: $err_msg_2" return -code error $err_msg } @@ -258,7 +258,7 @@ } foreach cmd $plsql { - eval $cmd + {*}$cmd } return 1 Index: openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl,v diff -u -r1.10.4.3 -r1.10.4.4 --- openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl 26 Oct 2013 10:55:45 -0000 1.10.4.3 +++ openacs-4/packages/acs-subsite/tcl/rel-types-procs.tcl 25 Aug 2014 09:37:55 -0000 1.10.4.4 @@ -177,7 +177,7 @@ set pretty_plural "#acs-translations.${message_key}_plural#" foreach cmd $plsql { - eval $cmd + {*}$cmd } # The following create table statement commits the transaction. If it @@ -195,7 +195,7 @@ for {set i [expr {[llength $plsql_drop] - 1}]} {$i >= 0} {incr i -1} { set drop_cmd [lindex $plsql_drop $i] - if {[catch {eval $dropcmd} err_msg_2]} { + if {[catch $dropcmd err_msg_2]} { append errmsg "\nAdditional error while trying to roll back: $err_msg_2" return -code error $errmsg }