From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/
Date: Mon, 8 Nov 2021 02:41:45 +0000 (UTC) [thread overview]
Message-ID: <1636339257.3373cca48e575bece69b1c76a3dc8482c29810ce.zmedico@gentoo> (raw)
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
next reply other threads:[~2021-11-08 2:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 2:41 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-03 4:23 [gentoo-commits] repo/gentoo:master commit in: app-emulation/snapd/ Zac Medico
2021-11-16 0:37 Zac Medico
2021-11-16 0:34 Zac Medico
2021-10-22 6:10 Zac Medico
2021-10-05 21:15 Zac Medico
2021-10-05 21:10 Zac Medico
2021-09-19 18:16 Zac Medico
2021-06-05 19:53 Zac Medico
2021-06-05 19:40 Zac Medico
2021-01-04 21:56 Zac Medico
2020-11-27 20:40 Zac Medico
2020-11-27 20:06 Zac Medico
2020-11-10 11:41 Zac Medico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1636339257.3373cca48e575bece69b1c76a3dc8482c29810ce.zmedico@gentoo \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox