[gentoo-commits] portage r9680 - main/trunk/pym/_emerge

[gentoo-commits] portage r9680 - main/trunk/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-04-02 19:09:13 +0000 (Wed, 02 Apr 2008)
New Revision: 9680

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
Use Package.cp instead of dep_getkey(cpv).


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2008-04-02 18:13:08 UTC (rev 9679)
+++ main/trunk/pym/_emerge/__init__.py	2008-04-02 19:09:13 UTC (rev 9680)
@@ -3631,6 +3631,8 @@
 					mydbapi.aux_get(pkg_key, self._mydbapi_keys)))
 				ebuild_path = None
 				repo_name = metadata["repository"]
+				built = pkg_type != "ebuild"
+				installed = pkg_type == "installed"
 				if pkg_type == "ebuild":
 					ebuild_path = portdb.findname(pkg_key)
 					if not ebuild_path: # shouldn't happen
@@ -3641,6 +3643,9 @@
 					metadata["USE"] = pkgsettings["PORTAGE_USE"]
 				else:
 					repo_path_real = portdb.getRepositoryPath(repo_name)
+				pkg_node = Package(type_name=pkg_type, root=myroot,
+					cpv=pkg_key, built=built, installed=installed,
+					metadata=metadata)
 				pkg_use = metadata["USE"].split()
 				try:
 					restrict = flatten(use_reduce(paren_reduce(
@@ -4785,8 +4790,7 @@
 					"--fetch-all-uri" not in self.myopts:
 
 					# Figure out if we need a restart.
-					if myroot == "/" and \
-						portage.dep_getkey(pkg_key) == "sys-apps/portage":
+					if myroot == "/" and pkg_node.cp == "sys-apps/portage":
 						if len(mymergelist) > mergecount:
 							emergelog(xterm_titles,
 								" ::: completed emerge ("+ \

-- 
gentoo-commits@lists.gentoo.org mailing list