Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
Date: Mon, 08 Nov 2021 02:45:17
Message-Id: 1636339257.3373cca48e575bece69b1c76a3dc8482c29810ce.zmedico@gentoo
1 commit: 3373cca48e575bece69b1c76a3dc8482c29810ce
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 8 02:39:44 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 8 02:40:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3373cca4
7
8 app-emulation/snapd: Rebase USE=-forced-devmode
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/snapd/snapd-2.53.1.ebuild | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/app-emulation/snapd/snapd-2.53.1.ebuild b/app-emulation/snapd/snapd-2.53.1.ebuild
17 index c0a495cddeb..3eb5f935325 100644
18 --- a/app-emulation/snapd/snapd-2.53.1.ebuild
19 +++ b/app-emulation/snapd/snapd-2.53.1.ebuild
20 @@ -70,7 +70,7 @@ src_prepare() {
21 "${MY_S}/cmd/snap-confine/snap-confine.apparmor.in" || die
22
23 if ! use forced-devmode; then
24 - sed -e 's#return \(!apparmorFull || cgroupv2\)#//\1\n\tif !apparmorFull || cgroupv2 {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
25 + sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
26 -i "${MY_S}/sandbox/forcedevmode.go" || die
27 grep -q 'panic("USE=forced-devmode is disabled")' "${MY_S}/sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
28 fi