summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-24 16:05:20 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-24 16:05:20 +0000
commitf5ca8d72597d533c9ff55f2f97df1517b381859a (patch)
tree7f1c213a680c14f46eb7c96657065aa21c0914b5
parent35b6e0d415146e6a00a15799fe6f9c08c58190a2 (diff)
downloadportage-f5ca8d72597d533c9ff55f2f97df1517b381859a.tar.gz
portage-f5ca8d72597d533c9ff55f2f97df1517b381859a.tar.bz2
portage-f5ca8d72597d533c9ff55f2f97df1517b381859a.zip
s/difference/symmetric_difference/ for the last two commits.
svn path=/main/trunk/; revision=4016
-rwxr-xr-xbin/emerge4
1 files changed, 2 insertions, 2 deletions
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) != \