From unknown Tue Aug 19 23:12:59 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64570] [PATCH] fix `guix publish --advertise' Resent-From: nathan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Jul 2023 06:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1689055322662 (code B ref -1); Tue, 11 Jul 2023 06:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jul 2023 06:02:02 +0000 Received: from localhost ([127.0.0.1]:49579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJ6Rl-0000AP-Vd for submit@debbugs.gnu.org; Tue, 11 Jul 2023 02:02:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:39120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJ4fg-0005YL-Jl for submit@debbugs.gnu.org; Tue, 11 Jul 2023 00:08:16 -0400 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 1qJ4fe-0007jo-DA for guix-patches@gnu.org; Tue, 11 Jul 2023 00:08:15 -0400 Received: from mail.nborghese.com ([207.148.28.48]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qJ4fc-0006Gi-DO for guix-patches@gnu.org; Tue, 11 Jul 2023 00:08:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=062122; bh=LaQgN6JWKbqJp /mbyOUS4QmCIG+iNaJBdRvx3OtBXtI=; h=date:subject:to:from; d=nborghese.com; b=h/0n6ULASE5tIeiK32wVfxwi5DVyX+oyAOoK8uOsI06E19Pa5Un SzKQTQ3jaVXX5PACmkATMsGZ6ivsWD7OietvyzOXcBy2JqDuMnSlj0uyKit/1UBeCLpmrF qSl6O8WqFaVWjXcuac0Qn5WwTQd2tU8A2yTUz2gk8Y6iYdeBYE= Received: by nborghese.com (OpenSMTPD) with ESMTPSA id 2d465701 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Tue, 11 Jul 2023 04:08:08 +0000 (UTC) User-agent: mu4e 1.10.5; emacs 29.0.92 From: nathan Date: Tue, 11 Jul 2023 00:01:43 -0400 Message-ID: <877cr7dr9z.fsf@nborghese.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=207.148.28.48; envelope-from=nathan_mail@nborghese.com; helo=mail.nborghese.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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-Spam-Score: -1.4 (-) X-Mailman-Approved-At: Tue, 11 Jul 2023 02:01:59 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Simple oversight. Since 0ae419877ce070721f8e5404c2fe7d721a22f998, timeout will be #f with `guix publish --advertise'. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-avahi-fix-exception-when-timeout-is-f.patch >From aa385273da1e97c5e69c34582611c7adf99ebbb4 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 10 Jul 2023 23:26:54 -0400 Subject: [PATCH] avahi: fix exception when timeout is #f * guix/avahi.scm (avahi-publish-service-thread): Fixes crash when timeout is #f, which is the default for "guix publish --advertise" --- guix/avahi.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/avahi.scm b/guix/avahi.scm index 502b0b9dcd..574fe0b850 100644 --- a/guix/avahi.scm +++ b/guix/avahi.scm @@ -84,7 +84,9 @@ (define client-callback client-flag/ignore-user-config) client-callback))) (while (not (stop-loop?)) - (iterate-simple-poll poll timeout)))))) + (if timeout + (iterate-simple-poll poll timeout) + (iterate-simple-poll poll))))))) (define (interface->ip-address interface) "Return the local IP address of the given INTERFACE." -- 2.41.0 --=-=-=-- From unknown Tue Aug 19 23:12:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: nathan Subject: bug#64570: closed (Re: bug#64570: [PATCH] fix `guix publish --advertise') Message-ID: References: <871qhe5zpc.fsf@gnu.org> <877cr7dr9z.fsf@nborghese.com> X-Gnu-PR-Message: they-closed 64570 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 64570@debbugs.gnu.org Date: Tue, 11 Jul 2023 13:46:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1689083162-9846-1" This is a multi-part message in MIME format... ------------=_1689083162-9846-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64570: [PATCH] fix `guix publish --advertise' which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64570@debbugs.gnu.org. --=20 64570: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64570 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1689083162-9846-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64570-done) by debbugs.gnu.org; 11 Jul 2023 13:45:46 +0000 Received: from localhost ([127.0.0.1]:49944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJDgX-0002YM-QH for submit@debbugs.gnu.org; Tue, 11 Jul 2023 09:45:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJDgV-0002Y8-58 for 64570-done@debbugs.gnu.org; Tue, 11 Jul 2023 09:45:44 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qJDgP-0004WF-Sa; Tue, 11 Jul 2023 09:45:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=JPRMVAEnVCtmfjRmKP9dS0d+cXbL8+3CtLDQK6hxjII=; b=qi4fgMza1bkLcv9uJ8w5 m6ybTbAm6ibtTfuTKlQNwKoiKNtjYd9O08hKoEETpDxg9/n6LsLoHYRBs1+LL6e2NuHZg/nGAlxwi DNjK0i7XdqbnN2kA+j83zqzXYXzTJkr5a6lMwjqyoU4QstyORyBMejs1ARVrno/rvhARaJqEKbxEB vbNAb0/83OhAPRo9ucOea9MQvCgtdhMRdDAbo6qS+z/yvFMegQCHrotc8ZNkdksBHfOweoDSFaZ56 +ZJvDSlcwUq+Q7xH+E1wzK/jql9ZVHF85Pc2u7LgwdrQ6HuBtrOI6RwBiA9DVhfeVbDkewKd4HSxr anDUUKCRxj5IHw==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qJDgP-0001dC-Fh; Tue, 11 Jul 2023 09:45:37 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: nathan Subject: Re: bug#64570: [PATCH] fix `guix publish --advertise' References: <877cr7dr9z.fsf@nborghese.com> Date: Tue, 11 Jul 2023 15:45:35 +0200 In-Reply-To: <877cr7dr9z.fsf@nborghese.com> (nathan's message of "Tue, 11 Jul 2023 00:01:43 -0400") Message-ID: <871qhe5zpc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 64570-done Cc: 64570-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, nathan skribis: > Simple oversight. > Since 0ae419877ce070721f8e5404c2fe7d721a22f998, timeout will be #f with `= guix publish --advertise'. > >>>From aa385273da1e97c5e69c34582611c7adf99ebbb4 Mon Sep 17 00:00:00 2001 > From: nathan > Date: Mon, 10 Jul 2023 23:26:54 -0400 > Subject: [PATCH] avahi: fix exception when timeout is #f > > * guix/avahi.scm (avahi-publish-service-thread): Fixes crash when timeout= is > #f, which is the default for "guix publish --advertise" Oops, my bad. Applied, thanks! Ludo=E2=80=99. ------------=_1689083162-9846-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Jul 2023 06:02:02 +0000 Received: from localhost ([127.0.0.1]:49579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJ6Rl-0000AP-Vd for submit@debbugs.gnu.org; Tue, 11 Jul 2023 02:02:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:39120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qJ4fg-0005YL-Jl for submit@debbugs.gnu.org; Tue, 11 Jul 2023 00:08:16 -0400 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 1qJ4fe-0007jo-DA for guix-patches@gnu.org; Tue, 11 Jul 2023 00:08:15 -0400 Received: from mail.nborghese.com ([207.148.28.48]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qJ4fc-0006Gi-DO for guix-patches@gnu.org; Tue, 11 Jul 2023 00:08:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=062122; bh=LaQgN6JWKbqJp /mbyOUS4QmCIG+iNaJBdRvx3OtBXtI=; h=date:subject:to:from; d=nborghese.com; b=h/0n6ULASE5tIeiK32wVfxwi5DVyX+oyAOoK8uOsI06E19Pa5Un SzKQTQ3jaVXX5PACmkATMsGZ6ivsWD7OietvyzOXcBy2JqDuMnSlj0uyKit/1UBeCLpmrF qSl6O8WqFaVWjXcuac0Qn5WwTQd2tU8A2yTUz2gk8Y6iYdeBYE= Received: by nborghese.com (OpenSMTPD) with ESMTPSA id 2d465701 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Tue, 11 Jul 2023 04:08:08 +0000 (UTC) User-agent: mu4e 1.10.5; emacs 29.0.92 From: nathan To: guix-patches@gnu.org Subject: [PATCH] fix `guix publish --advertise' Date: Tue, 11 Jul 2023 00:01:43 -0400 Message-ID: <877cr7dr9z.fsf@nborghese.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=207.148.28.48; envelope-from=nathan_mail@nborghese.com; helo=mail.nborghese.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 11 Jul 2023 02:01:59 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Simple oversight. Since 0ae419877ce070721f8e5404c2fe7d721a22f998, timeout will be #f with `guix publish --advertise'. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-avahi-fix-exception-when-timeout-is-f.patch >From aa385273da1e97c5e69c34582611c7adf99ebbb4 Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 10 Jul 2023 23:26:54 -0400 Subject: [PATCH] avahi: fix exception when timeout is #f * guix/avahi.scm (avahi-publish-service-thread): Fixes crash when timeout is #f, which is the default for "guix publish --advertise" --- guix/avahi.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/avahi.scm b/guix/avahi.scm index 502b0b9dcd..574fe0b850 100644 --- a/guix/avahi.scm +++ b/guix/avahi.scm @@ -84,7 +84,9 @@ (define client-callback client-flag/ignore-user-config) client-callback))) (while (not (stop-loop?)) - (iterate-simple-poll poll timeout)))))) + (if timeout + (iterate-simple-poll poll timeout) + (iterate-simple-poll poll))))))) (define (interface->ip-address interface) "Return the local IP address of the given INTERFACE." -- 2.41.0 --=-=-=-- ------------=_1689083162-9846-1--