Subject: bug#62128: closed (Re: [bug#62128] [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 20 Mar 2023 08:26:02 +0000

Your bug report

#62128: [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.

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 [email-masked].

-- 
62128: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62128
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#62128] [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.
From: Andrew Tropin <[email-masked]>
To: [email-masked], [email-masked]
Cc: [email-masked], [email-masked], [email-masked]
Date: Mon, 20 Mar 2023 12:24:49 +0400
List-Id: <debbugs-submit.debbugs.gnu.org>

On 2023-03-11 20:49, Nicolas Graves via Guix-patches via wrote:

> ---
>  gnu/services/networking.scm | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
> index 5c6ad4ce3b..b656f3c938 100644
> --- a/gnu/services/networking.scm
> +++ b/gnu/services/networking.scm
> @@ -1219,13 +1219,13 @@ (define (network-manager-environment config)
>  (define (network-manager-shepherd-service config)
>    (match-record config <network-manager-configuration>
>      (network-manager shepherd-requirement dns vpn-plugins iwd?)
> -    (let ((iwd? (or iwd?  ; TODO: deprecated field, remove later.
> -                    (and shepherd-requirement
> -                         (memq 'iwd shepherd-requirement))))
> -          (conf (plain-file "NetworkManager.conf"
> +    (let ((conf (plain-file "NetworkManager.conf"
>                              (string-append
>                               "[main]\ndns=" dns "\n"
> -                             (if iwd? "[device]\nwifi.backend=iwd\n" ""))))
> +                             (if (or iwd? ; TODO: deprecated, remove later.
> +                                     (and shepherd-requirement
> +                                            (memq 'iwd shepherd-requirement)))
> +                              "[device]\nwifi.backend=iwd\n" ""))))
>            (vpn  (vpn-plugin-directory vpn-plugins)))
>        (list (shepherd-service
>               (documentation "Run the NetworkManager.")

The shadowing for iwd? in let was missing, should be fixed by: 
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3a2200e1ad

-- 
Best regards,
Andrew Tropin

Subject: [PATCH] services: network-manager: Avoid doubling iwd shepherd-requirement.
From: Nicolas Graves <[email-masked]>
To: [email-masked]
Cc: [email-masked], [email-masked], [email-masked]
Date: Sat, 11 Mar 2023 20:49:13 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

---
 gnu/services/networking.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 5c6ad4ce3b..b656f3c938 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -1219,13 +1219,13 @@ (define (network-manager-environment config)
 (define (network-manager-shepherd-service config)
   (match-record config <network-manager-configuration>
     (network-manager shepherd-requirement dns vpn-plugins iwd?)
-    (let ((iwd? (or iwd?  ; TODO: deprecated field, remove later.
-                    (and shepherd-requirement
-                         (memq 'iwd shepherd-requirement))))
-          (conf (plain-file "NetworkManager.conf"
+    (let ((conf (plain-file "NetworkManager.conf"
                             (string-append
                              "[main]\ndns=" dns "\n"
-                             (if iwd? "[device]\nwifi.backend=iwd\n" ""))))
+                             (if (or iwd? ; TODO: deprecated, remove later.
+                                     (and shepherd-requirement
+                                            (memq 'iwd shepherd-requirement)))
+                              "[device]\nwifi.backend=iwd\n" ""))))
           (vpn  (vpn-plugin-directory vpn-plugins)))
       (list (shepherd-service
              (documentation "Run the NetworkManager.")
-- 
2.39.2