From 3541e3856fc232d2e5c0fe0edde4c8da0c3a99a8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 11 Jan 2008 05:47:25 +0000 Subject: [PATCH] Make sure that portdb.findname() returns the correct ebuild. (trunk r9164:9165) svn path=/main/branches/2.1.2/; revision=9173 --- bin/ebuild | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/bin/ebuild b/bin/ebuild index d4a3a6667..f82be264c 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -58,8 +58,20 @@ if not os.path.isabs(ebuild): ebuild = portage.normalize_path(ebuild) # portdbapi uses the canonical path for the base of the portage tree, but # subdirectories of the base can be built from symlinks (like crossdev does). -ebuild_portdir = os.path.realpath(os.path.dirname(os.path.dirname(ebuild))) -ebuild = os.path.join(ebuild_portdir, *ebuild.split(os.path.sep)[-2:]) +ebuild_portdir = os.path.realpath( + os.path.dirname(os.path.dirname(os.path.dirname(ebuild)))) +ebuild = os.path.join(ebuild_portdir, *ebuild.split(os.path.sep)[-3:]) + +# Make sure that portdb.findname() returns the correct ebuild. +if ebuild_portdir not in portage.portdb.porttrees: + os.environ["PORTDIR_OVERLAY"] = \ + os.environ.get("PORTDIR_OVERLAY","") + " " + ebuild_portdir + print "Appending %s to PORTDIR_OVERLAY..." % ebuild_portdir + portage.close_portdbapi_caches() + reload(portage) +del portage.portdb.porttrees[1:] +if ebuild_portdir != portage.portdb.porttree_root: + portage.portdb.porttrees.append(ebuild_portdir) if not os.path.exists(ebuild): print "'%s' does not exist." % ebuild @@ -88,17 +100,8 @@ else: portage_ebuild = portage.portdb.findname(cpv) if not portage_ebuild or portage_ebuild != ebuild: - overlay = "/".join(ebuild_split[:-2]) - os.environ["PORTDIR_OVERLAY"] = os.environ.get("PORTDIR_OVERLAY","") + " " + overlay - print "Appending %s to PORTDIR_OVERLAY..." % overlay - portage.close_portdbapi_caches() - reload(portage) - portage_ebuild = portage.portdb.findname(cpv) - - if not portage_ebuild or portage_ebuild != ebuild: - print "!!! %s does not seem to have a valid PORTDIR structure." % overlay - sys.exit(1) - + print "!!! %s does not seem to have a valid PORTDIR structure." % ebuild + sys.exit(1) if len(pargs) > 1 and "config" in pargs: print "config must be called on it's own, not combined with any other phase" -- 2.26.2