From: Fabian Groffen Date: Fri, 12 Oct 2007 11:36:32 +0000 (-0000) Subject: Use PORTAGE_BINHOST as repo_path(_real) such that instead of a ? for X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=321b63e87ce238b8b204804f8d81416e01821668;p=portage.git Use PORTAGE_BINHOST as repo_path(_real) such that instead of a ? for repository, we show it's url to the binhost in use. svn path=/main/branches/prefix/; revision=8083 --- diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 12b4d89d9..a0c70fac6 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -3076,7 +3076,10 @@ class depgraph(object): metadata = dict(izip(self._mydbapi_keys, mydbapi.aux_get(pkg_key, self._mydbapi_keys))) ebuild_path = None - repo_name = metadata["repository"] + if pkg_type == "binary": + repo_name = self.roots[myroot].settings.get("PORTAGE_BINHOST") + else: + repo_name = metadata["repository"] if pkg_type == "ebuild": ebuild_path = portdb.findname(pkg_key) if not ebuild_path: # shouldn't happen @@ -3086,7 +3089,7 @@ class depgraph(object): pkgsettings.setcpv(pkg_key, mydb=mydbapi) metadata["USE"] = pkgsettings["USE"] else: - repo_path_real = portdb.getRepositoryPath(repo_name) + repo_path_real = repo_name pkg_use = metadata["USE"].split() try: restrict = flatten(use_reduce(paren_reduce( @@ -3642,6 +3645,11 @@ class RepoDisplay(object): self._repo_paths_real = [ os.path.realpath(repo_path) \ for repo_path in repo_paths ] + if root_config.settings.get("PORTAGE_BINHOST"): + binhost = root_config.settings.get("PORTAGE_BINHOST") + self._repo_paths.append(binhost) + self._repo_paths_real.append(binhost) + # pre-allocate index for PORTDIR so that it always has index 0. for root_config in roots.itervalues(): portdb = root_config.trees["porttree"].dbapi