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

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

diff --git a/bin/emerge b/bin/emerge
index 7eb10fd58f2d89d00605cb46932a7b98aa2ea3d4..75258b12b3ae797e04354be738a91f3ef27079c7 100755 (executable)
--- 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) != \