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 39EFE1581FB for ; Tue, 27 Aug 2024 19:31:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85651E2A35; Tue, 27 Aug 2024 19:31:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6BCB9E2A35 for ; Tue, 27 Aug 2024 19:31:14 +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 A6FAF340C57 for ; Tue, 27 Aug 2024 19:31:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB1CD1EBD for ; Tue, 27 Aug 2024 19:31:11 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1724787067.e364d42394b445dc206e586d597b21b6552a4533.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/salt/salt-3007.1-r1.ebuild X-VCS-Directories: app-admin/salt/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: e364d42394b445dc206e586d597b21b6552a4533 X-VCS-Branch: master Date: Tue, 27 Aug 2024 19:31:11 +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: 4f5ec1a7-7208-4a3a-9725-1000e5a082cf X-Archives-Hash: 9c522b7fdb888a7965f8aaa499ae4add commit: e364d42394b445dc206e586d597b21b6552a4533 Author: Patrick McLean gentoo org> AuthorDate: Tue Aug 27 19:30:49 2024 +0000 Commit: Patrick McLean gentoo org> CommitDate: Tue Aug 27 19:31:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e364d423 app-admin/salt: Revert attempted fix for utcnow log spam Signed-off-by: Patrick McLean gentoo.org> app-admin/salt/salt-3007.1-r1.ebuild | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app-admin/salt/salt-3007.1-r1.ebuild b/app-admin/salt/salt-3007.1-r1.ebuild index 4a31938ecc9e..8ff966a32715 100644 --- a/app-admin/salt/salt-3007.1-r1.ebuild +++ b/app-admin/salt/salt-3007.1-r1.ebuild @@ -399,14 +399,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_prepare() { - if [[ ${EPYTHON#*.} -ge 12 ]]; then - # stop annoying warning from spamming logs - grep -Rl datetime.datetime.utcnow salt \ - | xargs sed -i 's:datetime.datetime.utcnow():datetime.datetime.now(datetime.UTC):' - fi -} - python_install_all() { local -x USE_SETUPTOOLS=1 distutils-r1_python_install_all