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 5E3981389E2 for ; Sat, 13 Dec 2014 07:24:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB02CE08D6; Sat, 13 Dec 2014 07:24:32 +0000 (UTC) Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0AE87E08D5 for ; Sat, 13 Dec 2014 07:24:31 +0000 (UTC) Received: by mail-wg0-f49.google.com with SMTP id n12so10696045wgh.8 for ; Fri, 12 Dec 2014 23:24:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:user-agent:mime-version:content-type :content-transfer-encoding:message-id; bh=4QGpZ1Y8eU1xuJBvbUv1Ygu3/Yvlvn3ahKy9WPzVkes=; b=ctDUolun7qkTCjmcYWcZmaqymzGtoVGeb5lGODPizvZ+ni41sRf+PDQt3cYPFOhQPB 2DLcWyU25H1T9Fm8WUI2TIUPFIS55nXAk0L+/M76EtkGX4DOrpzNVcrcwjQAAojTxKzX p5JWJUzxV9uW4dxsOZDb8X2z8rD8IqUD4O12OZjLJlbgBqD/ZmJyCikhvbuo86xZuSD+ J1XBMkEipEZ8lCYShVvOvZ72P86DnBXiBMf4sqNEVoZYk7CZYNwX5aG5k3YLkiaTPKM5 IgTo+snCGxhSOPO6i+pP/CREAtSJS2MednY8VhPyieDO6wuvXEz+M6FGaflmxoeCrZO3 Josg== X-Received: by 10.180.205.163 with SMTP id lh3mr14321460wic.63.1418455470903; Fri, 12 Dec 2014 23:24:30 -0800 (PST) Received: from afta-picea.localnet (host-94-251-141-202.dynamic.mm.pl. [94.251.141.202]) by mx.google.com with ESMTPSA id bj3sm4700668wib.3.2014.12.12.23.24.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Dec 2014 23:24:29 -0800 (PST) From: Arfrever Frehtes Taifersar Arahesis X-Google-Original-From: Arfrever Frehtes Taifersar Arahesis To: Gentoo Portage Development Subject: [gentoo-portage-dev] [PATCH] emerge --info: Always print ::repository Date: Sat, 13 Dec 2014 08:24:03 +0100 User-Agent: KMail (GNU/Linux) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart6956586.E6O3AtFqC8"; protocol="application/pgp-signature"; micalg=pgp-sha512 Content-Transfer-Encoding: 7bit Message-Id: <201412130824.04672.Arfrever.FTA@gmail.com> X-Archives-Salt: 1b89c61f-e696-4b11-90c8-9e7dd6b6d45f X-Archives-Hash: 72e71c54c6b476b889c727611dbf0ddc --nextPart6956586.E6O3AtFqC8 Content-Type: multipart/mixed; boundary="Boundary-01=_Um+iUhsEe9UAi7A" Content-Transfer-Encoding: 7bit --Boundary-01=_Um+iUhsEe9UAi7A Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline [[[ emerge --info: Always print ::repository. 1 call to deprecated portage.repository.config.RepoConfigLoader.mainRepo() function has been deleted. ]]] -- Arfrever Frehtes Taifersar Arahesis --Boundary-01=_Um+iUhsEe9UAi7A Content-Type: text/x-patch; charset="utf-8"; name="portage.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="portage.patch" =2D-- pym/_emerge/actions.py +++ 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 =2Dfrom 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): =20 myvars =3D sorted(set(atoms)) =20 =2D main_repo =3D portdb.repositories.mainRepo() =2D if main_repo is not None: =2D main_repo =3D main_repo.name cp_map =3D {} cp_max_len =3D 0 =20 @@ -1692,12 +1689,10 @@ def action_info(settings, trees, myopts, myfiles): if len(matched_cp) > cp_max_len: cp_max_len =3D len(matched_cp) repo =3D vardb.aux_get(cpv, ["repository"])[0] =2D if repo =3D=3D main_repo: =2D repo_suffix =3D "" =2D elif not repo: =2D repo_suffix =3D "::" + if repo: + repo_suffix =3D _repo_separator + repo else: =2D repo_suffix =3D "::" + repo + repo_suffix =3D _repo_separator + "" =20 if matched_cp =3D=3D orig_atom.cp: provide_suffix =3D "" @@ -1826,13 +1821,13 @@ def action_info(settings, trees, myopts, myfiles): =20 if pkg_type =3D=3D "installed": append("\n%s was built with the following:" % \ =2D colorize("INFORM", str(pkg.cpv))) + colorize("INFORM", str(pkg.cpv + _repo_separator + pkg.repo))) elif pkg_type =3D=3D "ebuild": =2D append("\n%s would be build with the following:" % \ =2D 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 =3D=3D "binary": append("\n%s (non-installed binary) was built with the following:" % \ =2D colorize("INFORM", str(pkg.cpv))) + colorize("INFORM", str(pkg.cpv + _repo_separator + pkg.repo))) =20 append('%s' % pkg_use_display(pkg, myopts)) if pkg_type =3D=3D "installed": @@ -2015,10 +2010,10 @@ def action_uninstall(settings, trees, ldpath_mtimes, atom =3D "=3D" + atom + "-" + \ portage.versions.cpv_getversion(cpv) if ext_atom.slot: =2D atom +=3D ":" + ext_atom.slot + atom +=3D _slot_separator + ext_atom.slot require_metadata =3D True if ext_atom.repo: =2D atom +=3D "::" + ext_atom.repo + atom +=3D _repo_separator + ext_atom.repo require_metadata =3D True =20 atom =3D Atom(atom, allow_repo=3DTrue) --Boundary-01=_Um+iUhsEe9UAi7A-- --nextPart6956586.E6O3AtFqC8 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJUi+mUAAoJEHgbAhhyXND8U/AP/1LyeZ11Y2RVt18Pl9XtnhYl g2entjH/sz7tpq/5Qz5JInxa6omzXMWp1v8R6obYJi4UvgzJEnrKygJftdD7789f D+Q4KmVQre9eo592/wXDhFz9CmKSDve2Mkpg8vn4hPbjQasBbH4XeAz8ZW+kKwP0 PREpImZir6tDfPL1MQ503tseC7ykQX6Y2BMKoQVZZKXibJGk/Xnwf3uUz+ma/rR8 XoV19dpBjbI9C0Ko3FxUQ8/0ojThyQ2EpLSSJ9pngk8t10JGRQWeOxCgo04qOUsc lIcvb5E+D3pL4Ogzkl7gRXN4lCC4gIa+M/lhoBMJ+oXwBXCUI3b0fz0UWRfG54Z7 k+KHz2iI0rDm6XvHaOTzmENE3MpQXeQMC7CHkNJl9Yxl5rL9/uktuaErK03Hs4Tr j75hWg3IxoaCR7j2ZNPqLDaexNNEwzxdbDuqn3CEY1/V6nkIZJJrhMPivIbYRjZb D8tr1PPv5Jzqj5/bYcBcOwnYNCTz3S7MI+t7pISlBP/VA/7FvV6fXlhQ6STEZ7Vv ymhNtAHfP7noMkm8FmQHvKkcFr58YWIlq9VfmV8HPzqIUIky23jjuohy+XUBkfPG KRJeCYmLGacTdHU9igtyxZH2EOu8h3SyZXuC3NDhwvgOjvGbBDwYfbwqjZJVGMuK +Yo20gQXQ61427a9UnBF =2c2J -----END PGP SIGNATURE----- --nextPart6956586.E6O3AtFqC8--