[yum-cvs] yum/yum sqlitesack.py,1.72,1.73

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv10282/yum

Modified Files:
	sqlitesack.py 
Log Message:
fix to work with either sqlite API


Index: sqlitesack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/sqlitesack.py,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sqlitesack.py	28 Feb 2007 13:00:02 -0000	1.72
+++ sqlitesack.py	28 Feb 2007 15:26:03 -0000	1.73
@@ -61,17 +61,21 @@
         """read the db obj. If asked for a specific item, return it.
            otherwise populate out into the object what exists"""
         if item:
-            if db_obj.has_key(item):
+            try:
                 return db_obj[item]
-            else:
+            except (IndexError, KeyError):
                 return None
 
         for item in ['name', 'arch', 'epoch', 'version', 'release', 'pkgId']:
-            if db_obj.has_key(item):
+            try:
                 setattr(self, item, db_obj[item])
+            except (IndexError, KeyError):
+                pass
 
-        if db_obj.has_key('checksum_value'):
+        try:
             self._checksums.append((db_obj['checksum_type'], db_obj['checksum_value'], True))
+        except (IndexError, KeyError):
+            pass
 
     def __getattr__(self, varname):
         db2simplemap = { 'packagesize' : 'size_package',