Use the abstract dbapi.aux_get() interface to unify retrieval of IUSE in depgraph...

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

diff --git a/bin/emerge b/bin/emerge
index 3924d29fe8d6cd826b1301016f16ec6c6b6fd75c..568f156a59bf96e3c9a5d97c5341e9304d1561f2 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -718,10 +718,7 @@ class depgraph:
                        if merging==0 and "--newuse" in self.myopts and \
                                vardbapi.cpv_exists(mykey):
                                old_use = vardbapi.aux_get(mykey, ["USE"])[0].split()
-                               if mytype == "binary":
-                                       iuses = set(bindb.aux_get(mykey, ["IUSE"])[0].split())
-                               else:
-                                       iuses = set(portdb.aux_get(mykey, ["IUSE"])[0].split())
+                               iuses = set(mydbapi.aux_get(mykey, ["IUSE"])[0].split())
                                if iuses.intersection(old_use) != \
                                        iuses.intersection(myuse):
                                        merging=1