From 1d375b829eafdc57e83c380b5d2bda880986bb7a Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 26 Feb 2007 21:40:18 +0000 Subject: [PATCH] Merged from trunk 6036:6039 Fix "NameError: global name 'myfilelist' is not defined" when collision-protect is enabled. Make sure that ${A} in initialized in case pkg_nofetch() needs to be called. Thanks to Peper for reporting. svn path=/main/branches/prefix/; revision=6082 --- pym/portage/__init__.py | 1 + pym/portage/dbapi/vartree.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index fb705e199..54181b746 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2666,6 +2666,7 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None mysettings=fetch_settings) myuris = [uri for uri in alluris \ if os.path.basename(uri) == myfile] + fetch_settings["A"] = myfile # for use by pkg_nofetch() if fetch(myuris, fetch_settings): success = True break diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index fb33931f7..2db939b82 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1286,8 +1286,8 @@ class dblink(object): collisions = [] - print green("*")+" checking "+str(len(myfilelist))+" files for package collisions" - for f in myfilelist: + print green("*")+" checking "+str(len(mycontents))+" files for package collisions" + for f in mycontents: nocheck = False # listdir isn't intelligent enough to exclude symlinked dirs, # so we have to do it ourself -- 2.26.2