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 600A11389E2 for ; Sat, 13 Dec 2014 07:04:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BCC6E095A; Sat, 13 Dec 2014 07:04:39 +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 12B9CE095A for ; Sat, 13 Dec 2014 07:04:38 +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 00B633406A2 for ; Sat, 13 Dec 2014 07:04:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91AA4C491 for ; Sat, 13 Dec 2014 07:04:36 +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: <1418454237.a34a05bd5dbbdb3e37682089c2cbb183db9bcb8a.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: a34a05bd5dbbdb3e37682089c2cbb183db9bcb8a X-VCS-Branch: master Date: Sat, 13 Dec 2014 07:04:36 +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: 7ef4b725-9e05-4246-9af0-5d796fb43b23 X-Archives-Hash: fd83f4e02d7c1cb7400baeda0d419c85 commit: a34a05bd5dbbdb3e37682089c2cbb183db9bcb8a Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sat Dec 13 07:03:57 2014 +0000 Commit: Arfrever Frehtes Taifersar Arahesis apache org> CommitDate: Sat Dec 13 07:03:57 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a34a05bd 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. --- pym/_emerge/actions.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 0ae2c16..28a69ee 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1713,13 +1713,9 @@ def action_info(settings, trees, myopts, myfiles): ((cp + ":").ljust(cp_max_len + 1), versions)) repos = portdb.settings.repositories - if "--verbose" in myopts: - append("Repositories:\n") - for repo in repos: - append(repo.info_string()) - else: - append("Repositories: %s" % \ - " ".join(repo.name for repo in repos)) + append("Repositories:\n") + for repo in repos: + append(repo.info_string()) installed_sets = sorted(s for s in root_config.sets['selected'].getNonAtoms() if s.startswith(SETPREFIX)) @@ -1732,8 +1728,8 @@ def action_info(settings, trees, myopts, myfiles): myvars = list(settings) else: myvars = ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK', - 'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', - 'PORTDIR_OVERLAY', 'PORTAGE_BUNZIP2_COMMAND', + 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', + 'PORTAGE_BUNZIP2_COMMAND', 'PORTAGE_BZIP2_COMMAND', 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS', 'ACCEPT_KEYWORDS', 'ACCEPT_LICENSE', 'FEATURES', @@ -1745,11 +1741,18 @@ def action_info(settings, trees, myopts, myfiles): 'PORTAGE_BZIP2_COMMAND' : 'bzip2', } - myvars = portage.util.unique_array(myvars) + skipped_vars = ['PORTAGE_REPOSITORIES'] + # Deprecated variables + skipped_vars.extend(('PORTDIR', 'PORTDIR_OVERLAY', 'SYNC')) + + myvars = set(myvars) + myvars.difference_update(skipped_vars) + myvars = sorted(myvars) + use_expand = settings.get('USE_EXPAND', '').split() use_expand.sort() unset_vars = [] - myvars.sort() + for k in myvars: v = settings.get(k) if v is not None: