[Erp5-report] r32884 kazuhiko - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Feb 22 02:41:50 2010
New Revision: 32884

URL: http://svn.erp5.org?rev=32884&view=rev
Log:
do not raise an exception if a module for old object is already removed.

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=32884&r1=32883&r2=32884&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Mon Feb 22 02:41:50 2010
@@ -786,9 +786,12 @@
         new_io = StringIO()
         old_io = StringIO()
         OFS.XMLExportImport.exportXML(new_object._p_jar, new_object._p_oid, new_io)
-        OFS.XMLExportImport.exportXML(old_object._p_jar, old_object._p_oid, old_io)
         new_obj_xml = new_io.getvalue()
-        old_obj_xml = old_io.getvalue()
+        try:
+          OFS.XMLExportImport.exportXML(old_object._p_jar, old_object._p_oid, old_io)
+          old_obj_xml = old_io.getvalue()
+        except ImportError, e: # module is already removed etc.
+          old_obj_xml = '(%s: %s)' % (e.__class__.__name__, e)
         new_io.close()
         old_io.close()
         if new_obj_xml != old_obj_xml: