Fix some broken variable references found by pyflakes.

svn path=/main/trunk/; revision=9299

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 5be88735d0e51bba4092c1fa7570b9a05927167c..2aacbd8dc7ad06c9b8fda52f7bc0344dece655d0 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2361,7 +2361,7 @@ class depgraph(object):
                                        metadata = None
                                if metadata and not built:
                                        if "?" in metadata["LICENSE"]:
-                                               pkgsettings.setcpv(p, mydb=portdb)
+                                               pkgsettings.setcpv(cpv, mydb=portdb)
                                                metadata["USE"] = pkgsettings.get("USE", "")
                                        else:
                                                metadata["USE"] = ""
@@ -6304,7 +6304,7 @@ def action_depclean(settings, trees, ldpath_mtimes,
                                except portage.exception.InvalidDependString, e:
                                        file_path = os.path.join(
                                                myroot, portage.VDB_PATH, pkg, "PROVIDE")
-                                       portage.writemsg("\n\nInvalid PROVIDE: %s\n" % str(s),
+                                       portage.writemsg("\n\nInvalid PROVIDE: %s\n" % str(e),
                                                noiselevel=-1)
                                        portage.writemsg("See '%s'\n" % file_path,
                                                noiselevel=-1)