From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 0AgfIVkldmP4AwEAbAwnHQ (envelope-from ) for ; Thu, 17 Nov 2022 13:13:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id KMsYIVkldmMCOQEA9RJhRA (envelope-from ) for ; Thu, 17 Nov 2022 13:13:13 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3CFCCBC87 for ; Thu, 17 Nov 2022 13:13:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovdlT-00026U-Tg; Thu, 17 Nov 2022 07:13:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovdlO-00025k-Jx for guix-patches@gnu.org; Thu, 17 Nov 2022 07:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ovdlO-00087Z-BX for guix-patches@gnu.org; Thu, 17 Nov 2022 07:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovdlO-0002l6-6l for guix-patches@gnu.org; Thu, 17 Nov 2022 07:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59223] [PATCH] services: gitolite: Use the correct variable for the user-group Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Nov 2022 12:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59223 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: EuAndreh Cc: 59223-done@debbugs.gnu.org, 59223@debbugs.gnu.org X-Debbugs-Original-Cc: 59223-done@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166868713110519 (code B ref -1); Thu, 17 Nov 2022 12:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Nov 2022 12:12:11 +0000 Received: from localhost ([127.0.0.1]:59458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovdkZ-0002jb-CB for submit@debbugs.gnu.org; Thu, 17 Nov 2022 07:12:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:47374) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovdkV-0002jO-O5 for submit@debbugs.gnu.org; Thu, 17 Nov 2022 07:12:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovdkV-0001ff-J6 for guix-patches@gnu.org; Thu, 17 Nov 2022 07:12:07 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovdkT-00081k-2Y for guix-patches@gnu.org; Thu, 17 Nov 2022 07:12:07 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 3EDF927BBE9; Thu, 17 Nov 2022 12:12:04 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 122439cd; Thu, 17 Nov 2022 12:12:03 +0000 (UTC) References: <20221112185321.17566-1-eu@euandre.org> User-agent: mu4e 1.8.11; emacs 28.2 From: Christopher Baines Date: Thu, 17 Nov 2022 12:11:30 +0000 In-reply-to: <20221112185321.17566-1-eu@euandre.org> Message-ID: <87wn7tdbl8.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668687193; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post; bh=WnegKjxkOCcwzw+1wxwss0xEAVEQw9a9yYrrXIAbwQo=; b=WGpJ67kZGBxPXDyXOUDwCYt5yC9XeMzquGmeKYRtN7S82g9HbWVGtoC6+voru86XrT+El+ mTYz8usFtuI1LoWptrSk0l7alJX3v3wZ/q05VlgpzWLKWjV4svR5T2XC2WubYk+Qm9Zhbc qFgTQGki7wuiU+EPcELgUhGoizHhSDZokUAEA9jXX9bAXfDQD7FnfXSo/lKPENGZM37diI jdvWRXg2HFhWxpgaYOosILsuWhGRKvtAHpYdCD5ocTmWVJvxZq0qBhXs5cc//sozy7N2ed E8Dh2oGlDAvGelXB0uFcAlbxSg4uM/CuqAKA18kB4ktqBFGB3XBgckW+ZEZ+mQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668687193; a=rsa-sha256; cv=none; b=cMhLGzs6MCOEz8B92ODQkdYCucJuMv2/vOc4P4kAbp16csRHoe3slOxJFllnrqBkeP01Sq AB4iU+KlQcW0Z5TWO7y+MXdoqWwXlk4SJUdPi/Z8nXeyVEeZKa4UbXLVZdjZGJKL/1NgGz LNAf2D4/u3g01X7OINgokywfZqDJ6PKsxPStLC8wLAIG8IlMwBIZwp7ZaF1W0lz0u1+u+H hLOUfuQPGH1o9sgkzY0x4hok3I3OLj86JFymllGmNRNpzS/6ptNOZoUMxs23SLl4xWqB30 d2btvghH4a05kIjvRGIeTmL5a8qb3OQQJP6ifGyYCFJ2S7r8KId0f1rK3IRk5Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.33 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3CFCCBC87 X-Spam-Score: -5.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: 2aC+ns5zUdWD --=-=-= Content-Type: text/plain EuAndreh via Guix-patches via writes: > The default value for has "git" for both the > values of the user and the group, as costumary, which means that unless > someone uses a custom configuration and chooses different strings for > user and group, this wouldn't show up. > > * gnu/services/version-control.scm (gitolite-accounts): Use the correct > variable for the name of a (user-group ...). > --- > > I did a "git grep user-group gnu/services/" and looked at the returned > entries. After a quick cursory look, either all the entries had a > hard-coded string value, or picked the correct variable for the group > name. So I think this one is a one-off :) > > This surfaced after a debugging session with mirai on IRC earlier today. > > gnu/services/version-control.scm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm > index b6b78e504e..86d40bdbe3 100644 > --- a/gnu/services/version-control.scm > +++ b/gnu/services/version-control.scm > @@ -313,7 +313,7 @@ (define gitolite-accounts > (($ package user group home-directory > rc-file admin-pubkey) > ;; User group and account to run Gitolite. > - (list (user-group (name user) (system? #t)) > + (list (user-group (name group) (system? #t)) > (user-account > (name user) > (group group) Good spot! I've pushed this to master as 35ef5fca0ac997680e47942e25f403fb3ec54c7d. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmN2JRNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XefeBAAh58N+l67CovzLzNcId0oVQlPcLGo2S6c /+IX/pHrqAEe86lrhZAsV9xsA2ee5whzECnu6BXY0/1kbu/xF5CmK/OAB1/rxqLO eyaJ4Ux6jOeXSjhIGnTJq8vyarejR5KI9JEWmDhPCeDCJZ9xgL6ui2L5XtA+JzwM G8B1zesN3BTaKVbHhnylFneJJhKRRoVOO3rLk6DtHMC0qynXLYGHP3DcvD9Y9S3W kSEUUr20lG4t6XiGw5/bP06JZxqanZV5/11CeOYlE2TIw41nLiHoLem7jNeogq+F yo7gkXSpOIBa7ns2iKigc8K+tdNN1nc48IuuByD7wJpHjXmtuZfSF89UU5TMNYY2 6vH0JDBz2nDO1872BLGFd1fd6oYgOcnb3QEhp6HTog/WCPPYpxmVb7WEM0XRgnJm /SpWHYxrJSw7DCty18JYgwSQN6los0vwrP+vDnzAHnIj6lKuNSrLyoxcWPIPN5k0 2tz2nEIxq7yMkl1M9YEHkoL1WyDXKy+gFPpvW7TtHi+s+FTgx33dpa8bZyQ9ZY0D EXd2iHWirHyCfNrzN0ejMwadsJ/j+bRPfjy8YD99glhBlACxEUBgdvhg5p6VyQOk sRzs+NYFdCjKvsCiyTlQAdTA92bQyRwqDaODtK6Bf8ftG42tFhI5OL9xgQpB3JWB Tn9+At4ocJ8= =MClf -----END PGP SIGNATURE----- --=-=-=--