For bug #187142, properly pass a dbapi instance into setcpv() so that USE_EXPAND...

svn path=/main/branches/2.1.2/; revision=7525

diff --git a/bin/emerge b/bin/emerge
index 9cad9379d77b7ebdb79b1e86f2fd84641090345d..71a5ae40ec70628cbf86385269f05a56dc9b4968 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2796,7 +2796,7 @@ class depgraph:
                                                raise portage_exception.PackageNotFound(pkg_key)
                                        repo_path_real = os.path.dirname(os.path.dirname(
                                                os.path.dirname(ebuild_path)))
-                                       pkgsettings.setcpv(pkg_key)
+                                       pkgsettings.setcpv(pkg_key, mydb=mydbapi)
                                        metadata["USE"] = pkgsettings["USE"]
                                else:
                                        repo_path_real = portdb.getRepositoryPath(repo_name)