From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 24 Jul 2006 16:05:20 +0000 (-0000)
Subject: s/difference/symmetric_difference/ for the last two commits.
X-Git-Tag: v2.1.1~143
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f5ca8d72597d533c9ff55f2f97df1517b381859a;p=portage.git

s/difference/symmetric_difference/ for the last two commits.

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

diff --git a/bin/emerge b/bin/emerge
index 7eb10fd58..75258b12b 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -746,7 +746,7 @@ class depgraph:
 				vardbapi.cpv_exists(mykey):
 				old_use = vardbapi.aux_get(mykey, ["USE"])[0].split()
 				iuses = set(mydbapi.aux_get(mykey, ["IUSE"])[0].split())
-				if iuses.difference(
+				if iuses.symmetric_difference(
 					vardbapi.aux_get(mykey, ["IUSE"])[0].split()):
 					merging = 1
 				elif iuses.intersection(old_use) != \
@@ -1068,7 +1068,7 @@ class depgraph:
 					now_use = pkgsettings["USE"].split()
 					if "--usepkgonly" not in self.myopts and \
 						myeb == myeb_pkg and \
-						iuses.difference(
+						iuses.symmetric_difference(
 						portdb.aux_get(myeb, ["IUSE"])[0].split()):
 						myeb_pkg = None
 					elif iuses.intersection(old_use) != \