From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CE4011389E2 for ; Sat, 13 Dec 2014 14:51:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1334E0ADE; Sat, 13 Dec 2014 14:51:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54735E0ADE for ; Sat, 13 Dec 2014 14:51:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F18D93406A7 for ; Sat, 13 Dec 2014 14:51:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E6F5C51A for ; Sat, 13 Dec 2014 14:51:28 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1418482121.39450d061e7de0756449466ba3d601b16ab6aae6.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 39450d061e7de0756449466ba3d601b16ab6aae6 X-VCS-Branch: master Date: Sat, 13 Dec 2014 14:51:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fc8ce1da-0155-446d-8b70-df1e972b91de X-Archives-Hash: 72b2cbe8b5c7b35a9ba5462ea597d124 commit: 39450d061e7de0756449466ba3d601b16ab6aae6 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Dec 13 14:48:41 2014 +0000 Commit: Arfrever Frehtes Taifersar Arahesis apache org> CommitDate: Sat Dec 13 14:48:41 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=39450d06 emerge --info: Always print ::repository. 1 call to deprecated portage.repository.config.RepoConfigLoader.mainRepo() function has been deleted. --- pym/_emerge/actions.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 28a69ee..8050f61 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -42,7 +42,7 @@ from portage.const import GLOBAL_CONFIG_PATH, VCS_DIRS, _DEPCLEAN_LIB_CHECK_DEFA from portage.const import SUPPORTED_BINPKG_FORMATS, TIMESTAMP_FORMAT from portage.dbapi.dep_expand import dep_expand from portage.dbapi._expand_new_virt import expand_new_virt -from portage.dep import Atom +from portage.dep import Atom, _repo_separator, _slot_separator from portage.eclass_cache import hashed_path from portage.exception import InvalidAtom, InvalidData, ParseError from portage.output import blue, colorize, create_color_func, darkgreen, \ @@ -1668,9 +1668,6 @@ def action_info(settings, trees, myopts, myfiles): myvars = sorted(set(atoms)) - main_repo = portdb.repositories.mainRepo() - if main_repo is not None: - main_repo = main_repo.name cp_map = {} cp_max_len = 0 @@ -1692,12 +1689,10 @@ def action_info(settings, trees, myopts, myfiles): if len(matched_cp) > cp_max_len: cp_max_len = len(matched_cp) repo = vardb.aux_get(cpv, ["repository"])[0] - if repo == main_repo: - repo_suffix = "" - elif not repo: - repo_suffix = "::" + if repo: + repo_suffix = _repo_separator + repo else: - repo_suffix = "::" + repo + repo_suffix = _repo_separator + "" if matched_cp == orig_atom.cp: provide_suffix = "" @@ -1826,13 +1821,13 @@ def action_info(settings, trees, myopts, myfiles): if pkg_type == "installed": append("\n%s was built with the following:" % \ - colorize("INFORM", str(pkg.cpv))) + colorize("INFORM", str(pkg.cpv + _repo_separator + pkg.repo))) elif pkg_type == "ebuild": - append("\n%s would be build with the following:" % \ - colorize("INFORM", str(pkg.cpv))) + append("\n%s would be built with the following:" % \ + colorize("INFORM", str(pkg.cpv + _repo_separator + pkg.repo))) elif pkg_type == "binary": append("\n%s (non-installed binary) was built with the following:" % \ - colorize("INFORM", str(pkg.cpv))) + colorize("INFORM", str(pkg.cpv + _repo_separator + pkg.repo))) append('%s' % pkg_use_display(pkg, myopts)) if pkg_type == "installed": @@ -2015,10 +2010,10 @@ def action_uninstall(settings, trees, ldpath_mtimes, atom = "=" + atom + "-" + \ portage.versions.cpv_getversion(cpv) if ext_atom.slot: - atom += ":" + ext_atom.slot + atom += _slot_separator + ext_atom.slot require_metadata = True if ext_atom.repo: - atom += "::" + ext_atom.repo + atom += _repo_separator + ext_atom.repo require_metadata = True atom = Atom(atom, allow_repo=True)