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 BB1F9138ACE for ; Mon, 8 Dec 2014 19:05:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75C0FE07F2; Mon, 8 Dec 2014 19:04:57 +0000 (UTC) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF73AE07EB for ; Mon, 8 Dec 2014 19:04:56 +0000 (UTC) Received: by mail-wg0-f48.google.com with SMTP id y19so6917416wgg.21 for ; Mon, 08 Dec 2014 11:04:55 -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=W3j6JFE2vZR1xVRoHBng6TGgU5NP3PTJG09XQtBiFus=; b=Jhl6kzD3nn2mYG0QjDMieOtMv7WCKHolEDLPTjMFG3kn5cIwF9PEF00On+EDKthNpY mLM5IMkngmndpVhyIGDm529XG9O/2OjHQnPQZYZooSDjtQkN3BusvaZ+7HKm59ci/cGw HDViDwyUIhgshHs6I2ULa5M8Bekclrd5bys73TnyIuhNTWGzAPmx4Gb0EGyCyAXhe+JQ EZJO+cEzojy0lCjPrZD58wNzNlSJ6fvwk4fqZTsTcwFbwLj1MG9GwzeDy+2nsLfz/hWI O9jp/ft3dq1NSKFMr8WaQwxdiG1dD5iXAktXH9I4kmBYQ+mi/oKsPFKqmWW3EECPxDNU AyQA== X-Received: by 10.180.90.81 with SMTP id bu17mr25718210wib.23.1418065495685; Mon, 08 Dec 2014 11:04:55 -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 bj7sm57688230wjc.33.2014.12.08.11.04.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Dec 2014 11:04:54 -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: Modernize output of configuration of repositories Date: Mon, 8 Dec 2014 20:04:11 +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="nextPart1721189.zbksUIIhQm"; protocol="application/pgp-signature"; micalg=pgp-sha512 Content-Transfer-Encoding: 7bit Message-Id: <201412082004.14263.Arfrever.FTA@gmail.com> X-Archives-Salt: ece44df0-0c4e-400d-9e6b-609e7864d7e7 X-Archives-Hash: d8324c088c1bf57ccb6cf81d2b889904 --nextPart1721189.zbksUIIhQm Content-Type: multipart/mixed; boundary="Boundary-01=_tYfhU1mC5/b/698" Content-Transfer-Encoding: 7bit --Boundary-01=_tYfhU1mC5/b/698 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline [[[ emerge --info: Modernize output of configuration of repositories. - Always print detailed configuration of repositories. - Always skip PORTAGE_REPOSITORIES variable. - Always skip deprecated PORTDIR, PORTDIR_OVERLAY and SYNC variables. ]]] -- Arfrever Frehtes Taifersar Arahesis --Boundary-01=_tYfhU1mC5/b/698 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 @@ -1707,13 +1707,9 @@ ((cp + ":").ljust(cp_max_len + 1), versions)) =20 repos =3D portdb.settings.repositories =2D if "--verbose" in myopts: =2D append("Repositories:\n") =2D for repo in repos: =2D append(repo.info_string()) =2D else: =2D append("Repositories: %s" % \ =2D " ".join(repo.name for repo in repos)) + append("Repositories:\n") + for repo in repos: + append(repo.info_string()) =20 installed_sets =3D sorted(s for s in root_config.sets['selected'].getNonAtoms() if s.startswith(SETPREFIX)) @@ -1726,8 +1722,8 @@ myvars =3D list(settings) else: myvars =3D ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK', =2D 'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', =2D 'PORTDIR_OVERLAY', 'PORTAGE_BUNZIP2_COMMAND', + 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', + 'PORTAGE_BUNZIP2_COMMAND', 'PORTAGE_BZIP2_COMMAND', 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS', 'ACCEPT_KEYWORDS', 'ACCEPT_LICENSE', 'FEATURES', @@ -1735,6 +1731,16 @@ =20 myvars.extend(portage.util.grabfile(settings["PORTDIR"]+"/profiles/info_= vars")) =20 + skipped_vars =3D ['PORTAGE_REPOSITORIES', '_'] + # Deprecated variables + skipped_vars.extend(('PORTDIR', 'PORTDIR_OVERLAY', 'SYNC')) + + for skipped_var in skipped_vars: + try: + myvars.remove(skipped_var) + except ValueError: + pass + myvars_ignore_defaults =3D { 'PORTAGE_BZIP2_COMMAND' : 'bzip2', } --Boundary-01=_tYfhU1mC5/b/698-- --nextPart1721189.zbksUIIhQm Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJUhfYuAAoJEHgbAhhyXND8ngMQAKpejJEwoPfeJr8wwCouwQms 3fdp1OhpHgazqe8aDSB/00tDvRQtHJ2ktZ+e6b6gMPm9tL7ktvk3xbDyt03gZEOb QdEK+OOs5a/e44oxOA1on2NtmrQzQfaSujE8kHcnB0P+J/6jYmOGo75ulAK0b67R Lg2wMrhD53bhy7oYSyqJGnXxQz4DQgH52XK9M3xDpadnvh7bKCDk69sK+Q2FVwc4 YBhLKIUNvCvmdMobV4EEU+54QJC8YNhPKIfiV7JSVoZlgWXEHNwCqirUshAF4ZgX 5jadqlToR5rsNYquvw+oT3yF00hqGnsCV0h5WxjzAhcAqpG8+ZNtH5HkQi4QEg0Y mfwJlWZVFSoxzm85vn12yiJEimEhldlc7bDEbwfb1x9n7ntjWX+/wJEii7+e70Qi L3Km3Va6MW87/bd7Ezo50ygnoPTLbM+fTgmj3+cnwFm6I1myUK39UK78SwMwUl/+ eBUnTZYI98CF10yP4P2NHdzGKx4pQ2FvFv2GQADtJZInkkrE+W/Qn+lNZJEpRgcR n1JGtIU3JDPa9vdD3MhKdNVZ4AsWUMJYr3XJn8vbqI/D+NnYAI6MQBUmzepo9mRZ SzPe9CLiNin2uOjKCF3A4DmEIvGT5acTjtp9dd0RsSiXNQEGCmTIXMwiv3MYQsyG NbXum00KjSuCmbk4Ij4A =fdj8 -----END PGP SIGNATURE----- --nextPart1721189.zbksUIIhQm--