[Erp5-report] r44729 luke - /erp5/trunk/products/ERP5/Tool/TemplateTool.py

[nobody at svn.erp5.org]

Author: luke
Date: Tue Mar 29 15:57:32 2011
New Revision: 44729

URL: http://svn.erp5.org?rev=44729&view=rev
Log:
 - cast safely to integer before doing comparision, in case of failure always propose upgrade

Modified:
    erp5/trunk/products/ERP5/Tool/TemplateTool.py

Modified: erp5/trunk/products/ERP5/Tool/TemplateTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/TemplateTool.py?rev=44729&r1=44728&r2=44729&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/TemplateTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/TemplateTool.py [utf8] Tue Mar 29 15:57:32 2011
@@ -1246,10 +1246,19 @@ class TemplateTool (BaseTool):
         listbox_object_list = BusinessTemplate_getModifiedObject.__of__(imported_bt5)()
         install_kw = {}
         previous_bt5 = self.getInstalledBusinessTemplate(bt_title)
-        if previous_bt5 is not None and \
-            (imported_bt5.getRevision() <= previous_bt5.getRevision()):
-          log("%s is already installed with same or newer revision." % bt_title)
-          return imported_bt5
+        if previous_bt5 is not None:
+          try:
+            imported_revision = int(imported_bt5.getRevision())
+          except ValueError:
+            imported_revision = None
+          try:
+            previous_revision = int(previous_bt5.getRevision())
+          except ValueError:
+            previous_revision = None
+          if imported_revision is not None and imported_revision is not None \
+              and (imported_revision <= previous_revision):
+            log("%s is already installed with revision %r, which is same or newer revision then new revision %r." % (bt_title, previous_bt5.getRevision(), imported_bt5.getRevision()))
+            return imported_bt5
 
         for listbox_line in listbox_object_list:
           item = listbox_line.object_id