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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB97D158003 for ; Tue, 23 May 2023 02:59:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 199EBE0858; Tue, 23 May 2023 02:59:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F132BE0858 for ; Tue, 23 May 2023 02:59:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE5BB335CEA for ; Tue, 23 May 2023 02:59:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7520AA64 for ; Tue, 23 May 2023 02:59:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1684810753.11b975054dc001b69f0138f1335b2d384ece184b.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 11b975054dc001b69f0138f1335b2d384ece184b X-VCS-Branch: master Date: Tue, 23 May 2023 02:59:23 +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: e068fe92-96a6-40da-bb23-81a69365ba2a X-Archives-Hash: 56ac6678002550f45f729709dd85a5ea commit: 11b975054dc001b69f0138f1335b2d384ece184b Author: Berin Aniesh gmail com> AuthorDate: Mon May 22 10:50:02 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 23 02:59:13 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=11b97505 actions: drop duplication of --help logic --help is already handled in `emerge_main()` and the deleted codeblock is not needed / unreachable. Signed-off-by: Berin Aniesh gmail.com> Closes: https://github.com/gentoo/portage/pull/1044 Signed-off-by: Sam James gentoo.org> lib/_emerge/actions.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py index 0aceb2c44..60199dae6 100644 --- a/lib/_emerge/actions.py +++ b/lib/_emerge/actions.py @@ -3522,9 +3522,6 @@ def run_action(emerge_config): noiselevel=-1, ) return 0 - if emerge_config.action == "help": - emerge_help() - return 0 spinner = stdout_spinner() if "candy" in emerge_config.target_config.settings.features: