From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1337566-garchives=archives.gentoo.org@lists.gentoo.org>
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 9F71A158087
for <garchives@archives.gentoo.org>; Mon, 8 Nov 2021 02:45:17 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 71F642BC003;
Mon, 8 Nov 2021 02:45:16 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 59E9F2BC003
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Nov 2021 02:45:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 46601342D6B
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Nov 2021 02:45:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BDDE156
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Nov 2021 02:41:45 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
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" <zmedico@gentoo.org>
Message-ID: <1636339257.3373cca48e575bece69b1c76a3dc8482c29810ce.zmedico@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/snapd/snapd-2.53.1.ebuild
X-VCS-Directories: app-emulation/snapd/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 3373cca48e575bece69b1c76a3dc8482c29810ce
X-VCS-Branch: master
Date: Mon, 8 Nov 2021 02:41:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 52da4986-6169-4a1c-9c1e-f77b023a703e
X-Archives-Hash: 03a018a240a7d0cd9a8751a3536bbf25
commit: 3373cca48e575bece69b1c76a3dc8482c29810ce
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 8 02:39:44 2021 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov 8 02:40:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3373cca4
app-emulation/snapd: Rebase USE=-forced-devmode
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-emulation/snapd/snapd-2.53.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-emulation/snapd/snapd-2.53.1.ebuild b/app-emulation/snapd/snapd-2.53.1.ebuild
index c0a495cddeb..3eb5f935325 100644
--- a/app-emulation/snapd/snapd-2.53.1.ebuild
+++ b/app-emulation/snapd/snapd-2.53.1.ebuild
@@ -70,7 +70,7 @@ src_prepare() {
"${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
if ! use forced-devmode; then
- sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
+ sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-i "${MY_S}/sandbox/forcedevmode.go" || die
grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
fi