From: Zac Medico Date: Sat, 12 Sep 2009 01:36:28 +0000 (-0000) Subject: Bug #257660 - Handle directories that are unlisted in Entries, which is normal X-Git-Tag: v2.2_rc41~46 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a399b35ab64bae798a53536ac97f174d3020d3f3;p=portage.git Bug #257660 - Handle directories that are unlisted in Entries, which is normal when checked out without -P. Thanks to Christian Ruppert for this patch. svn path=/main/trunk/; revision=14222 --- diff --git a/pym/portage/cvstree.py b/pym/portage/cvstree.py index a35c5fcf1..0fd2a54c5 100644 --- a/pym/portage/cvstree.py +++ b/pym/portage/cvstree.py @@ -252,7 +252,11 @@ def getentries(mydir,recursive=0): print mydir,file if os.path.isdir(mydir+"/"+file): if file not in entries["dirs"]: - entries["dirs"][file]={"dirs":{},"files":{}} + # It's normal for a directory to be unlisted in Entries + # when checked out without -P (see bug #257660). + rentries=getentries(mydir+"/"+file,recursive) + entries["dirs"][file]["dirs"]=rentries["dirs"] + entries["dirs"][file]["files"]=rentries["files"] if "status" in entries["dirs"][file]: if "exists" not in entries["dirs"][file]["status"]: entries["dirs"][file]["status"]+=["exists"]