Use get() to simplify setitem logic as suggested by Brian Harring. This patch is...

svn path=/main/branches/2.1/; revision=3581

diff --git a/pym/cache/metadata_overlay.py b/pym/cache/metadata_overlay.py
index b12740bdb16de52b3638e11aa26e7c8f0952ecad..287e05521ca4734c53447bb18717aa436df9f596 100644 (file)
--- a/pym/cache/metadata_overlay.py
+++ b/pym/cache/metadata_overlay.py
@@ -36,18 +36,16 @@ class database(template.database):
                        return value
 
        def _setitem(self, name, values):
-               try:
-                       value_ro = self.db_ro[name]
-                       if self._are_values_identical(value_ro,values):
-                               # we have matching values in the underlying db_ro
-                               # so it is unnecessary to store data in db_rw
-                               try:
-                                       del self.db_rw[name] # delete unwanted whiteout when necessary
-                               except KeyError:
-                                       pass
-                               return
-               except KeyError:
-                       pass
+               value_ro = self.db_ro.get(name, None)
+               if value_ro is not None and \
+                       self._are_values_identical(value_ro, values):
+                       # we have matching values in the underlying db_ro
+                       # so it is unnecessary to store data in db_rw
+                       try:
+                               del self.db_rw[name] # delete unwanted whiteout when necessary
+                       except KeyError:
+                               pass
+                       return
                self.db_rw[name] = values
 
        def _delitem(self, cpv):