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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8D9CE15814C for ; Tue, 24 Oct 2023 02:21:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1E9D2BC017; Tue, 24 Oct 2023 02:21:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8A7312BC017 for ; Tue, 24 Oct 2023 02:21:41 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98B00335C34 for ; Tue, 24 Oct 2023 02:21:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3B8112B7 for ; Tue, 24 Oct 2023 02:21:38 +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: <1698113714.9dab01175ae28bb93e41f7fb20a4b8205bf7c511.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9dab01175ae28bb93e41f7fb20a4b8205bf7c511 X-VCS-Branch: master Date: Tue, 24 Oct 2023 02:21:38 +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: d3a56cd9-d352-41b9-a748-009c200bb84c X-Archives-Hash: 8ce36a861f0e586d1d61807067012396 commit: 9dab01175ae28bb93e41f7fb20a4b8205bf7c511 Author: Zac Medico gentoo org> AuthorDate: Tue Oct 24 01:19:28 2023 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Oct 24 02:15:14 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9dab0117 bin/ebuild: Move imports before main Signed-off-by: Zac Medico gentoo.org> bin/ebuild | 83 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/bin/ebuild b/bin/ebuild index 09457b2940..cbefb58161 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -17,54 +17,55 @@ class SignalInterrupt(KeyboardInterrupt): self.signum = signum -def main(): - def signal_interrupt(signum, _frame): - raise SignalInterrupt(signum) +def signal_interrupt(signum, _frame): + raise SignalInterrupt(signum) - def debug_signal(_signum, _frame): - import pdb - pdb.set_trace() +def debug_signal(_signum, _frame): + import pdb - # Prevent "[Errno 32] Broken pipe" exceptions when writing to a pipe. - signal.signal(signal.SIGPIPE, signal.SIG_DFL) - signal.signal(signal.SIGTERM, signal_interrupt) - signal.signal(signal.SIGUSR1, debug_signal) + pdb.set_trace() - import argparse - from os import path as osp - import sys - import textwrap - if osp.isfile( - osp.join( - osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed" - ) - ): - sys.path.insert( - 0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib") - ) - import portage - - portage._internal_caller = True - from portage import os - from portage import _encodings - from portage import _shell_quote - from portage import _unicode_encode - from portage.const import VDB_PATH - from portage.exception import ( - PermissionDenied, - PortageKeyError, - PortagePackageException, - UnsupportedAPIException, +# Prevent "[Errno 32] Broken pipe" exceptions when writing to a pipe. +signal.signal(signal.SIGPIPE, signal.SIG_DFL) +signal.signal(signal.SIGTERM, signal_interrupt) +signal.signal(signal.SIGUSR1, debug_signal) + +import argparse +from os import path as osp +import sys +import textwrap + +if osp.isfile( + osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed") +): + sys.path.insert( + 0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib") ) - from portage.localization import _ - import portage.util - from portage.util._eventloop.global_event_loop import global_event_loop - from _emerge.actions import apply_priorities - from _emerge.Package import Package - from _emerge.RootConfig import RootConfig +import portage + +portage._internal_caller = True +from portage import os +from portage import _encodings +from portage import _shell_quote +from portage import _unicode_encode +from portage.const import VDB_PATH +from portage.exception import ( + PermissionDenied, + PortageKeyError, + PortagePackageException, + UnsupportedAPIException, +) +from portage.localization import _ +import portage.util +from portage.util._eventloop.global_event_loop import global_event_loop +from _emerge.actions import apply_priorities +from _emerge.Package import Package +from _emerge.RootConfig import RootConfig + +def main(): portage.process.sanitize_fds() description = "See the ebuild(1) man page for more info" usage = "Usage: ebuild [command] ..."