~ruther/guix-local: daemon: Clear $NIX_SUBSTITUTERS when passed '--no-substitutes'.

968e84a6cf9941963df0437d9e99adad805e8143 — Ludovic Courtès 12 years ago ad0ab74

daemon: Clear $NIX_SUBSTITUTERS when passed '--no-substitutes'.

* nix/nix-daemon/guix-daemon.cc (main): When --no-substitutes is used,
  clear NIX_SUBSTITUTERS.  Before that, and after
  89faa5c75cb3a419c6d02c51f56955275b7ae351, '--no-substitutes' would
  lead to attempts to use 'download-using-manifests.pl', which in
  practice would gracelessly fail.

patch browse .tar.gz

1 files changed, 7 insertions(+), 0 deletions(-)

M nix/nix-daemon/guix-daemon.cc

M nix/nix-daemon/guix-daemon.cc => nix/nix-daemon/guix-daemon.cc +7 -0

@@ 296,6 296,13 @@ main (int argc, char *argv[])
 	      setenv ("NIX_SUBSTITUTERS", subst.c_str (), 1);
 	    }
 	}
+      else
+	/* Clear the substituter list to make sure nothing ever gets
+	   substituted, regardless of the client's settings.  */
+	setenv ("NIX_SUBSTITUTERS", "", 1);
+
+      /* Effect the $NIX_SUBSTITUTERS change.  */
+      settings.update ();
 
       if (geteuid () == 0 && settings.buildUsersGroup.empty ())
 	fprintf (stderr, "warning: daemon is running as root, so "