From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 2 Apr 2008 19:22:20 +0000 (-0000)
Subject: Fix the previous commit so that the Package instance is created in the
X-Git-Tag: v2.2_pre6~269
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bb3bcea25eaaf8eac7c3b7b1d866de706c7e80f;p=portage.git

Fix the previous commit so that the Package instance is created in the
correct scope.

svn path=/main/trunk/; revision=9681
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a33929d56..51a576900 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4535,8 +4535,10 @@ class MergeTask(object):
 
 		mergecount=0
 		for x in mymergelist:
-			mergecount+=1
 			pkg_type = x[0]
+			if pkg_type == "blocks":
+				continue
+			mergecount+=1
 			myroot=x[1]
 			pkg_key = x[2]
 			pkgindex=2
@@ -4560,6 +4562,11 @@ class MergeTask(object):
 					raise AssertionError("Package type: '%s'" % pkg_type)
 				metadata.update(izip(metadata_keys,
 					mydbapi.aux_get(pkg_key, metadata_keys)))
+			built = pkg_type != "ebuild"
+			installed = pkg_type == "installed"
+			pkg = Package(type_name=pkg_type, root=myroot,
+				cpv=pkg_key, built=built, installed=installed,
+				metadata=metadata)
 			if x[0]=="blocks":
 				pkgindex=3
 			y = portdb.findname(pkg_key)
@@ -4790,7 +4797,7 @@ class MergeTask(object):
 					"--fetch-all-uri" not in self.myopts:
 
 					# Figure out if we need a restart.
-					if myroot == "/" and pkg_node.cp == "sys-apps/portage":
+					if myroot == "/" and pkg.cp == "sys-apps/portage":
 						if len(mymergelist) > mergecount:
 							emergelog(xterm_titles,
 								" ::: completed emerge ("+ \