From: Zac Medico Date: Thu, 30 Apr 2009 07:18:41 +0000 (-0000) Subject: If a repo doesn't have metadata/layout.conf then use either missing eclass X-Git-Tag: v2.1.6.12~56 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69817ddc12ea1952e831d80eaf69a314e8f9b496;p=portage.git If a repo doesn't have metadata/layout.conf then use either missing eclass directory or missing profiles/profiles.desc to trigger assignment of a default master. (trunk r13361) svn path=/main/branches/2.1.6/; revision=13517 --- diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index c07cf4ff2..2be49d58f 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -254,10 +254,12 @@ class portdbapi(dbapi): porttrees.append(master_path) if not porttrees: - # Make PORTDIR the default master, but only if this - # repo doesn't provide profiles.desc itself. + # Make PORTDIR the default master, but only if our + # heuristics suggest that it's necessary. profiles_desc = os.path.join(path, 'profiles', 'profiles.desc') - if not os.path.exists(profiles_desc): + eclass_dir = os.path.join(path, 'eclass') + if not os.path.isfile(profiles_desc) or \ + not os.path.isdir(eclass_dir): porttrees.append(porttree_root) porttrees.append(path)