From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 8 Feb 2008 11:43:56 +0000 (-0000)
Subject: Fix some broken variable references found by pyflakes.
X-Git-Tag: v2.1.4.4~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e7ce00c4bbeb1a1df6818f41953f7a0f2ffa8ab;p=portage.git

Fix some broken variable references found by pyflakes.

svn path=/main/branches/2.1.2/; revision=9298
---

diff --git a/bin/emerge b/bin/emerge
index 2c538e9a7..0536fb1cb 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1687,7 +1687,7 @@ class depgraph:
 					self._missing_args.append(arg)
 
 				if "selective" not in self.myparams:
-					self._show_unsatisfied_dep(myroot, atom)
+					self._show_unsatisfied_dep(myroot, arg)
 					return 0
 
 		# Do this even when addme is False (--onlydeps) so that the
@@ -2910,6 +2910,8 @@ class depgraph:
 		return retlist
 
 	def xcreate(self,mode="system"):
+		myroot = self.target_root
+		pkgsettings = self.pkgsettings[myroot]
 		vardb = self.trees[self.target_root]["vartree"].dbapi
 		portdb = self.trees[self.target_root]["porttree"].dbapi
 		bindb = self.trees[self.target_root]["bintree"].dbapi
@@ -5855,8 +5857,8 @@ def action_depclean(settings, trees, ldpath_mtimes,
 				try:
 					arg_atom = args_set.findAtomForPackage(pkg, metadata)
 				except portage_exception.InvalidDependString, e:
-					file_path = os.path.join(myroot, VDB_PATH, pkg, "PROVIDE")
-					portage.writemsg("\n\nInvalid PROVIDE: %s\n" % str(s),
+					file_path = os.path.join(myroot, portage.VDB_PATH, pkg, "PROVIDE")
+					portage.writemsg("\n\nInvalid PROVIDE: %s\n" % str(e),
 						noiselevel=-1)
 					portage.writemsg("See '%s'\n" % file_path,
 						noiselevel=-1)