[gentoo-commits] proj/portage:master commit in: pym/portage/emaint/modules/merges/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     ca7966d72cdb1522d3d29536a07c7bb8d7ecaa3f
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 02:09:01 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Dec  4 19:56:35 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ca7966d7

MergesHandler: don't use load_emerge_config

Use the old portage.db API since load_emerge_config isn't really
needed here. In order to reload the config, use
portage._reset_legacy_globals().

---
 pym/portage/emaint/modules/merges/merges.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pym/portage/emaint/modules/merges/merges.py b/pym/portage/emaint/modules/merges/merges.py
index 1a67cb5..7146c76 100644
--- a/pym/portage/emaint/modules/merges/merges.py
+++ b/pym/portage/emaint/modules/merges/merges.py
@@ -1,8 +1,6 @@
 # Copyright 2005-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-from _emerge.actions import load_emerge_config
-
 import portage
 from portage import os, _unicode_encode
 from portage.const import MERGING_IDENTIFIER, PORTAGE_BIN_PATH, PRIVATE_PATH, \
@@ -174,8 +172,7 @@ class MergesHandler(object):
 		@type pkg_invalid_entries: set
 		"""
 
-		emerge_config = load_emerge_config()
-		portdb = emerge_config.target_config.trees['porttree'].dbapi
+		portdb = portage.db[portage.root]['porttree'].dbapi
 		for failed_pkg in failed_pkgs:
 			# validate pkg name
 			pkg_name = '%s' % failed_pkg.replace(MERGING_IDENTIFIER, '')
@@ -271,8 +268,8 @@ class MergesHandler(object):
 		for pkg in sorted(self._scan()):
 			results.append("'%s' still found as a failed merge." % pkg)
 		# reload config and remove successful packages from tracking file
-		emerge_config = load_emerge_config()
-		vardb = emerge_config.target_config.trees['vartree'].dbapi
+		portage._reset_legacy_globals()
+		vardb = portage.db[portage.root]['vartree'].dbapi
 		still_failed_pkgs = {}
 		for pkg, mtime in failed_pkgs.items():
 			pkg_name = '%s' % pkg.replace(MERGING_IDENTIFIER, '')