Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl,v diff -u -N -r1.10.2.3 -r1.10.2.4 --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 9 Jan 2017 16:49:27 -0000 1.10.2.3 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 10 Jan 2017 13:27:16 -0000 1.10.2.4 @@ -38,7 +38,8 @@ # The package is mounted, unmount it and delete it together # with the site node site_node::unmount -node_id $node_id - site_node::delete -node_id $node_id -delete_subnodes + site_node::delete -node_id $node_id \ + -delete_subnodes -delete_package } else { # Delete the package apm_package_instance_delete $package_id Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v diff -u -N -r1.93.2.17 -r1.93.2.18 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 10 Jan 2017 12:59:09 -0000 1.93.2.17 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 10 Jan 2017 13:27:16 -0000 1.93.2.18 @@ -134,6 +134,7 @@ ad_proc -public site_node::delete { {-node_id:required} -delete_subnodes:boolean + -delete_package:boolean } { delete the site node } { @@ -165,7 +166,9 @@ # first delete package_id under this node... set package_id [site_node::get_object_id \ -node_id $node_id] - apm_package_instance_delete $package_id + if {$delete_package_p} { + apm_package_instance_delete $package_id + } # ...then the node itself db_exec_plsql delete_site_node {} update_cache -node_id $node_id