Index: openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl,v
diff -u -r1.39.2.2 -r1.39.2.3
--- openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl	7 Oct 2020 17:36:23 -0000	1.39.2.2
+++ openacs-4/packages/dotlrn-static/tcl/dotlrn-static-procs.tcl	14 Oct 2020 15:38:59 -0000	1.39.2.3
@@ -88,7 +88,9 @@
         db_transaction {
             set package_url [site_node::get_package_url -package_key [package_key]]
             if { $package_url ne "" } {
-                site_node::unmount -node_id [site_node::get_node_id -url $package_url]
+                set node_id [site_node::get_node_id -url $package_url]
+                site_node::unmount -node_id $node_id
+                site_node::delete -node_id $node_id -delete_subnodes
             }
             dotlrn_applet::remove_applet_from_dotlrn -applet_key [applet_key]
         }
Index: openacs-4/packages/dotlrn-static/tcl/test/dotlrn-static-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/tcl/test/dotlrn-static-test-procs.tcl,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/dotlrn-static/tcl/test/dotlrn-static-test-procs.tcl	8 Oct 2020 06:36:10 -0000	1.1.2.3
+++ openacs-4/packages/dotlrn-static/tcl/test/dotlrn-static-test-procs.tcl	14 Oct 2020 15:38:59 -0000	1.1.2.4
@@ -78,14 +78,15 @@
         set portal_exists_p [db_0or1row foo {
             select * from portals where portal_id=:portal_id
         }]
+        set applet_key [dotlrn_static::applet_key]
         if {$portal_exists_p} {
             aa_log "Portal created (portal_id: $portal_id)"
-            if {[dotlrn_applet::get_applet_id_from_key -applet_key [dotlrn_static::applet_key]] ne ""} {
+            if {[dotlrn_applet::get_applet_id_from_key -applet_key $applet_key] ne ""} {
                 #
                 # Remove the applet in advance, if it already exists
                 #
                 dotlrn_static::remove_applet
-                aa_log "Removed existing applet"
+                aa_true "Removed existing applet" "[expr {[dotlrn_applet::get_applet_id_from_key -applet_key $applet_key] eq ""}]"
             }
             #
             # Create some content
@@ -106,7 +107,7 @@
             # Add applet
             #
             dotlrn_static::add_applet
-            aa_true "Add applet" "[expr {[dotlrn_applet::get_applet_id_from_key -applet_key [dotlrn_static::applet_key]] ne ""}]"
+            aa_true "Add applet" "[expr {[dotlrn_applet::get_applet_id_from_key -applet_key $applet_key] ne ""}]"
             #
             # Add portlet to portal
             #
@@ -129,7 +130,7 @@
             # Remove applet
             #
             dotlrn_static::remove_applet
-            aa_equals "Remove applet" "[dotlrn_applet::get_applet_id_from_key -applet_key [dotlrn_static::applet_key]]" ""
+            aa_equals "Remove applet" "[dotlrn_applet::get_applet_id_from_key -applet_key $applet_key]" ""
         } else {
             aa_error "Portal creation failed"
         }