01/13: daemon: Correctly handle '--discover' with no value.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit bc3896db25c788c181c7bcd65754e7cd378e9d9f
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue Mar 16 22:34:57 2021 +0100

    daemon: Correctly handle '--discover' with no value.
    
    Previously, we'd get:
    
      $ guix-daemon --discover
      error: basic_string::_M_construct null not valid
    
    * nix/nix-daemon/guix-daemon.cc (parse_opt): Change second argument to
    'settings.set' to properly handle case where ARG is NULL.
---
 nix/nix-daemon/guix-daemon.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index 30d0e5d..36a06a3 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -1,5 +1,5 @@
 /* GNU Guix --- Functional package management for GNU
-   Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic 
Courtès <ludo@gnu.org>
+   Copyright (C) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021 Ludovic 
Courtès <ludo@gnu.org>
    Copyright (C) 2006, 2010, 2012, 2014 Eelco Dolstra <e.dolstra@tudelft.nl>
 
    This file is part of GNU Guix.
@@ -268,7 +268,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
       break;
     case GUIX_OPT_DISCOVER:
       useDiscover = string_to_bool (arg);
-      settings.set("discover", arg);
+      settings.set ("discover", useDiscover ? "true" : "false");
       break;
     case GUIX_OPT_DEBUG:
       verbosity = lvlDebug;