[rhmessaging-commits] rhmessaging commits: r2055 - mgmt/mint/python/mint.

[rhmessaging-commits at lists.jboss.org]

Author: nunofsantos
Date: 2008-05-15 11:32:27 -0400 (Thu, 15 May 2008)
New Revision: 2055

Modified:
   mgmt/mint/python/mint/__init__.py
Log:
handle missed map lookups

Modified: mgmt/mint/python/mint/__init__.py
===================================================================
--- mgmt/mint/python/mint/__init__.py	2008-05-15 15:03:20 UTC (rev 2054)
+++ mgmt/mint/python/mint/__init__.py	2008-05-15 15:32:27 UTC (rev 2055)
@@ -379,6 +379,9 @@
         if cls:
           d[convertedKey] = conn.getByOriginalId(cls, d.pop(parentKey))
       obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d["idOriginal"], create=True)
+      if (not obj):
+        self.log("Couldn't find type %s id %s" % (objectName, d["idOriginal"]))
+        return 
       obj.set(**d)
       obj.syncUpdate()
     except TypeError, detail:
@@ -387,10 +390,6 @@
     except KeyError, detail:
       self.log("Schema mismatch: %s" % detail)
       return 
-    except ProgrammingError, detail:
-      # XXX FIX
-      self.log("SQL syntax error: %s" % detail)
-      return
 
     self.log("END CONFIG---------------------------------------------------\n")
     return obj
@@ -406,7 +405,8 @@
 
     try:
       obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d[self.convertIdKey("id")])
-      if not obj:
+      if (not obj):
+        self.log("Couldn't find type %s id %s" % (objectName, d[self.convertIdKey("id")]))
         print "lion", classInfo, list
         return
 
@@ -415,6 +415,10 @@
       objStats = objNameStats.__new__(objNameStats)
       objStats.__init__()
 
+      if (not objStats):
+        self.log("Couldn't find type %s id %s" % (objNameStats, d[self.convertIdKey("id")]))
+        return
+
       objStats.set(**d)
       objStats.syncUpdate()
 
@@ -432,10 +436,6 @@
     except KeyError, detail:
       self.log("Schema mismatch: %s" % detail)
       return 
-    except ProgrammingError, detail:
-      # XXX FIX
-      self.log("SQL syntax error: %s" % detail)
-      return
 
     self.log("END INST---------------------------------------------------\n")
     return objStats