From patchwork Mon Jul 25 09:43:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 40921 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F63727BBEA; Mon, 25 Jul 2022 10:47:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6707327BBE9 for ; Mon, 25 Jul 2022 10:47:23 +0100 (BST) Received: from localhost ([::1]:60168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFugM-0003Qr-Fk for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 05:47:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFug3-0003Qh-BS for guix-patches@gnu.org; Mon, 25 Jul 2022 05:47:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFug2-0005wP-KS for guix-patches@gnu.org; Mon, 25 Jul 2022 05:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFug2-0004zk-DG for guix-patches@gnu.org; Mon, 25 Jul 2022 05:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56758] [PATCH 0/2] Don't try to mkdir XDG_RUNTIME_DIR Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 09:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56758 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56758@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165874240119169 (code B ref -1); Mon, 25 Jul 2022 09:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jul 2022 09:46:41 +0000 Received: from localhost ([127.0.0.1]:49290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFufg-0004z7-G7 for submit@debbugs.gnu.org; Mon, 25 Jul 2022 05:46:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:47386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFufe-0004yz-P8 for submit@debbugs.gnu.org; Mon, 25 Jul 2022 05:46:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFufe-0003Js-Ft for guix-patches@gnu.org; Mon, 25 Jul 2022 05:46:38 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:41319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFufa-0005o4-Kr for guix-patches@gnu.org; Mon, 25 Jul 2022 05:46:37 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 49ABB24000B for ; Mon, 25 Jul 2022 09:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1658742390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=nmKVQe2/RYUl9zZkz2ZghI3w0uMMed4qVNjT9n61JNg=; b=b8BkpYn4xZENLbQaibJ7UeE2tgSLcasF0wpPb8c5EzXvckj9uzfqbyfNOcVYrxUaUXg6in HMkD2yNrocUSj9+AmJt+jaHWg9biCInuO/h0LiGkddx2gScaSOZjjRIayjyLJa9GhKiRcc hZaPllozWgNw6csGTlkJKpGA0HoOl5PV+jajHPW6nQrAe5B5HNpedtsGQ+hhDOhTTMsa5d azy3Qhm253wekosqscOZUYYN4sV0CcxSp+4/ADFePKlMVxpMWHFkdUDh2GGu3zk6ans1KT lnNCTvEb2p/EBTcbmXk0IwWwVY+ZSl5Evn3Vo6FMszvmrPP1Vj32kHGfdPXxbQ== From: Andrew Tropin Date: Mon, 25 Jul 2022 12:43:47 +0300 Message-ID: <87wnc1zfrh.fsf@trop.in> MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.178.230; envelope-from=andrew@trop.in; helo=relay10.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Andrew Tropin (2): home: xdg: Use closures in activation scripts. home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script. gnu/home/services/xdg.scm | 46 ++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 18 deletions(-) From da332f8272ea3c240fc4e3664051da3b3a4e18c6 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 21 Jul 2022 17:06:24 +0300 Subject: [PATCH 2/2] home: xdg: Skip mkdir XDG_RUNTIME_DIR in activation script. * gnu/home/services/xdg.scm (ensure-xdg-base-dirs-on-activation): Skip mkdir XDG_RUNTIME_DIR in activation script. --- gnu/home/services/xdg.scm | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm index 5a41dc4994..541f64a379 100644 --- a/gnu/home/services/xdg.scm +++ b/gnu/home/services/xdg.scm @@ -109,13 +109,18 @@ (define (ensure-xdg-base-dirs-on-activation config) (with-imported-modules '((guix build utils)) #~(map (lambda (xdg-base-dir-variable) ((@ (guix build utils) mkdir-p) - (getenv - xdg-base-dir-variable))) - '#$(map (lambda (field) - (format - #f "XDG_~a" - (object->snake-case-string - (configuration-field-name field) 'upper))) + (getenv xdg-base-dir-variable))) + '#$(filter-map + (lambda (field) + (let ((env-var-name + (format + #f "XDG_~a" + (object->snake-case-string + (configuration-field-name field) 'upper)))) + ;; XDG_RUNTIME_DIR shouldn't be created during activation + ;; and will be provided by elogind or other service. + (and (not (string=? "XDG_RUNTIME_DIR" env-var-name)) + env-var-name))) home-xdg-base-directories-configuration-fields)))) (define (last-extension-or-cfg config extensions) -- 2.37.0