From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0B34B138354 for ; Mon, 23 Mar 2020 14:49:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A93DE0AA2; Mon, 23 Mar 2020 14:49:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28E7EE0AA2 for ; Mon, 23 Mar 2020 14:49:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 36A0134F890 for ; Mon, 23 Mar 2020 14:49:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A96AD19B for ; Mon, 23 Mar 2020 01:51:45 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1584926266.ce66387db2ecad4c9b11b94a5aac6cf0181902c0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/actions.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ce66387db2ecad4c9b11b94a5aac6cf0181902c0 X-VCS-Branch: master Date: Mon, 23 Mar 2020 01:51:45 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1cbbfc24-edde-4ef3-83b8-944971a0aebf X-Archives-Hash: 4dda9e0e0b648a16167d74087238303f commit: ce66387db2ecad4c9b11b94a5aac6cf0181902c0 Author: Sam James (sam_c) cmpct info> AuthorDate: Sun Mar 22 02:23:54 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Mar 23 01:17:46 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ce66387d emerge --info: Filter variables for credentials Bug: https://bugs.gentoo.org/713726 Closes: https://github.com/gentoo/portage/pull/536 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Zac Medico gentoo.org> lib/_emerge/actions.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py index 7a39d5ec7..392f98d4d 100644 --- a/lib/_emerge/actions.py +++ b/lib/_emerge/actions.py @@ -56,6 +56,7 @@ bad = create_color_func("BAD") warn = create_color_func("WARN") from portage.package.ebuild._ipc.QueryCommand import QueryCommand from portage.package.ebuild.doebuild import _check_temp_dir +from portage.package.ebuild.fetch import _hide_url_passwd from portage._sets import load_default_config, SETPREFIX from portage._sets.base import InternalPackageSet from portage.util import cmp_sort_key, writemsg, varexpand, \ @@ -1899,6 +1900,9 @@ def action_info(settings, trees, myopts, myfiles): if default is not None and \ default == v: continue + + v = _hide_url_passwd(v) + append('%s="%s"' % (k, v)) else: use = set(v.split())