* [bug#54019] [PATCH] doc: Fix 'setuid-program' example.
@ 2022-02-16 1:18 John Kehayias via Guix-patches via
2022-02-24 4:17 ` bug#54019: " Maxim Cournoyer
0 siblings, 1 reply; 2+ messages in thread
From: John Kehayias via Guix-patches via @ 2022-02-16 1:18 UTC (permalink / raw)
To: 54019
[-- Attachment #1: Type: text/plain, Size: 593 bytes --]
On #guix an error was reported in adding a setuid-program, but which followed the example in the manual. Looks like %setuid-programs was moved out a level in 1b87dc2f2a897f5fe0b3f8984c2544335ac87b56. The indentation was misleading (implying %setuid-programs was in the list sexp) previous to that commit.
I believe this should be the correct format, and Kolev (who had the setuid-program problem on #guix) reported moving the paren fixed the error.
Please see the attached patch. I did not add a copyright line for fixing this typo, but if it should be added, please do.
Thanks!
John
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-doc-Fix-setuid-program-example.patch --]
[-- Type: text/x-patch; name=0001-doc-Fix-setuid-program-example.patch, Size: 1078 bytes --]
From cccfce7d6d01e286277d5a847c89f428a2d66fe1 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Tue, 15 Feb 2022 20:09:09 -0500
Subject: [PATCH] doc: Fix 'setuid-program' example.
%setuid-programs was previously moved to be in the list sexp instead of just
the append one. This causes an "invalid G-expression input" error.
Error reported by: Kolev on #guix.
* doc/guix.texi (Setuid Programs): Move %setuid-programs out to the append
sexp.
---
doc/guix.texi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 039b418038..d966137dfe 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -34506,8 +34506,8 @@ Setuid Programs
;; Some fields omitted...
(setuid-programs
(append (list (setuid-program
- (program (file-append nfs-utils "/sbin/mount.nfs")))
- %setuid-programs))))
+ (program (file-append nfs-utils "/sbin/mount.nfs"))))
+ %setuid-programs)))
@end lisp
@deftp {Data Type} setuid-program
--
2.34.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#54019: [PATCH] doc: Fix 'setuid-program' example.
2022-02-16 1:18 [bug#54019] [PATCH] doc: Fix 'setuid-program' example John Kehayias via Guix-patches via
@ 2022-02-24 4:17 ` Maxim Cournoyer
0 siblings, 0 replies; 2+ messages in thread
From: Maxim Cournoyer @ 2022-02-24 4:17 UTC (permalink / raw)
To: John Kehayias; +Cc: 54019-done
Hello,
John Kehayias <john.kehayias@protonmail.com> writes:
> On #guix an error was reported in adding a setuid-program, but which
> followed the example in the manual. Looks like %setuid-programs was
> moved out a level in 1b87dc2f2a897f5fe0b3f8984c2544335ac87b56. The
> indentation was misleading (implying %setuid-programs was in the list
> sexp) previous to that commit.
>
> I believe this should be the correct format, and Kolev (who had the
> setuid-program problem on #guix) reported moving the paren fixed the
> error.
>
> Please see the attached patch. I did not add a copyright line for
> fixing this typo, but if it should be added, please do.
It's not needed, no (as per the <= 10 changed lines rule of thumb).
Pushed as 50311f338f.
Thanks to all involved :-).
Maxim
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-24 4:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-16 1:18 [bug#54019] [PATCH] doc: Fix 'setuid-program' example John Kehayias via Guix-patches via
2022-02-24 4:17 ` bug#54019: " Maxim Cournoyer
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.