unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Carlo Zancanaro <carlo@zancanaro.id.au>
To: 66659@debbugs.gnu.org
Subject: bug#66659: [PATCH] home: services: Don't crash on-first-login when nothing to do
Date: Sat, 21 Oct 2023 20:39:21 +1100	[thread overview]
Message-ID: <c965aedf13b5146e2491aabae3ca823f8e089c9c.1697881003.git.carlo@zancanaro.id.au> (raw)
In-Reply-To: <87pm18codq.fsf@zancanaro.id.au>

* gnu/home/services.scm (compute-on-first-login-script): Ensure that WHEN is
syntactically valid in expansion.
---
 gnu/home/services.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/home/services.scm b/gnu/home/services.scm
index 651c068f79..3f018e3893 100644
--- a/gnu/home/services.scm
+++ b/gnu/home/services.scm
@@ -435,7 +435,10 @@ (define (compute-on-first-login-script _ gexps)
          ;; after complete logout/reboot.
          (if (file-exists? xdg-runtime-dir)
              (when (claim-first-run flag-file-path)
-               #$@gexps)
+               #$@gexps
+               ;; An empty WHEN body is not syntactically valid, so we put an
+               ;; arbitrary form here to ensure it's not empty.
+               #t)
              ;; TRANSLATORS: 'on-first-login' is the name of a service and
              ;; shouldn't be translated
              (warning (G_ "XDG_RUNTIME_DIR doesn't exists, on-first-login script

base-commit: 80c8f5b57aa3699445fab29e0f75f5955e697509
-- 
2.41.0





  reply	other threads:[~2023-10-21  9:40 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-21  6:14 bug#66659: (home-)on-first-login script broken when no gexps are added Nils Landt
2023-10-21  9:27 ` Carlo Zancanaro
2023-10-21  9:39   ` Carlo Zancanaro [this message]
2023-10-21 14:15   ` Ludovic Courtès
     [not found] ` <handler.66659.D66659.169789774918233.notifdone@debbugs.gnu.org>
2023-10-24 10:05   ` bug#66659: closed (Re: bug#66659: (home-)on-first-login script broken when no gexps are added) Nils Landt
2023-10-24 23:19     ` bug#66659: (home-)on-first-login script broken when no gexps are added Clément Lassieur
2023-10-27 22:22     ` Ludovic Courtès
2023-10-24 14:17 ` Rostislav Svoboda
2023-10-27 14:53   ` Clément Lassieur

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c965aedf13b5146e2491aabae3ca823f8e089c9c.1697881003.git.carlo@zancanaro.id.au \
    --to=carlo@zancanaro.id.au \
    --cc=66659@debbugs.gnu.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.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).