Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/xowiki/www/admin/import.tcl	4 Sep 2008 11:57:38 -0000	1.15
+++ openacs-4/packages/xowiki/www/admin/import.tcl	19 Nov 2009 22:57:19 -0000	1.16
@@ -52,8 +52,16 @@
         foreach o [::xowiki::Page allinstances] {
           if {![info exists preexists($o)]} {lappend objects $o}
         }
-        set msg [$package_id import -replace $replace -create_user_ids $create_user_ids \
-                     -objects $objects]
+        ns_log notice "objects to import: $objects"
+        if {[catch {
+          set msg [$package_id import -replace $replace -create_user_ids $create_user_ids \
+                       -objects $objects]
+        } errMsg]} {
+          ns_log notice "Error during import: $errMsg"
+          foreach o $objects {$o destroy}
+          error $errMsg
+        }
+        foreach o $objects {if {[::xotcl::Object isobject $o]} {$o destroy}}
       }
       namespace delete ::xo::import
     }