[PATCH] doc: Fix 'setuid-program' example.

  • Done
  • quality assurance status badge
Details
2 participants
  • John Kehayias
  • Maxim Cournoyer
Owner
unassigned
Submitted by
John Kehayias
Severity
normal

Debbugs page

John Kehayias wrote 3 years ago
(name . Guix-patches)(address . guix-patches@gnu.org)
ozHsH2E3Jry7yRQ3RviQS2Zp0oW6ZYzs25VkqPevVq0kC7mILA8N3O6kDVgvRphVtXYDpDmDD0BSblKVsgKc_zbNdfufqRPclJ9gjslpZBQ=@protonmail.com
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
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(-)

Toggle diff (17 lines)
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
Maxim Cournoyer wrote 3 years ago
(name . John Kehayias)(address . john.kehayias@protonmail.com)(address . 54019-done@debbugs.gnu.org)
87fso8lwym.fsf@gmail.com
Hello,

John Kehayias <john.kehayias@protonmail.com> writes:

Toggle quote (13 lines)
> 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
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 54019@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 54019
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help