From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 29 Sep 2006 01:14:31 +0000 (-0000)
Subject: Use dict.pop(k, None) to delete items if they exist.
X-Git-Tag: v2.1.2~752
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14f7a4f8098b75ba5d39e7e9e1751fda3a1c2904;p=portage.git

Use dict.pop(k, None) to delete items if they exist.

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

diff --git a/bin/emerge b/bin/emerge
index af6d552f0..6e2b3c883 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3470,8 +3470,7 @@ def action_build(settings, trees, mtimedb,
 		myresumeopts = dict([(k,True) for k in mtimedb["resume"]["myopts"]])
 
 		for opt in ("--skipfirst", "--ask", "--tree"):
-			if opt in myresumeopts:
-				del myresumeopts[opt]
+			myresumeopts.pop(opt, None)
 
 		for myopt, myarg in myopts.iteritems():
 			if myopt not in myresumeopts: