From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 20 Jun 2006 22:39:50 +0000 (-0000)
Subject: Use get() to simplify setitem logic as suggested by Brian Harring.
X-Git-Tag: v2.1.1~454
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11c03b891526e89f5884f966df6e8456b9af9145;p=portage.git

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

svn path=/main/trunk/; revision=3546
---

diff --git a/pym/cache/metadata_overlay.py b/pym/cache/metadata_overlay.py
index 104dc34d1..821beead1 100644
--- a/pym/cache/metadata_overlay.py
+++ b/pym/cache/metadata_overlay.py
@@ -35,18 +35,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):