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
