summary refs log tree commit diff
path: root/nix/nix-daemon
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-03-16 22:34:57 +0100
committerLudovic Courtès <ludo@gnu.org>2021-03-17 12:03:23 +0100
commitbc3896db25c788c181c7bcd65754e7cd378e9d9f (patch)
treef5090474db857fa4376d69d27a6425f8cb4ac5b9 /nix/nix-daemon
parentf194fbf50eecc9f38045520db0d1a719175172ae (diff)
downloadguix-bc3896db25c788c181c7bcd65754e7cd378e9d9f.tar.gz
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.
Diffstat (limited to 'nix/nix-daemon')
-rw-r--r--nix/nix-daemon/guix-daemon.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index 30d0e5d11d..36a06a3fae 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;