uds: limit output of nixconf lines when using determinatenixd

DeterminateSystems · Jul 29, 2024 · 6a5c612 · 6a5c612
1 parent 3e7118d
commit 6a5c612
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/cli/cmd/login/mod.rs b/src/cli/cmd/login/mod.rs
@@ -211,6 +211,16 @@ impl LoginSubcommand {
 
         if !succeeded {
             update_netrc_file(&netrc_file_path, &netrc_contents).await?;
+
+            // only update user_nix_config if we could use determinatenixd
+            upsert_user_nix_config(
+                &nix_config_path,
+                &netrc_file_string,
+                &netrc_contents,
+                &user_nix_config_addition,
+                &self.cache_addr,
+            )
+            .await?;
         }
         // NOTE: Keep an eye on any movement in the following issues / PRs. Them being resolved
         // means we may be able to ditch setting `netrc-file` in favor of `access-tokens`. (The
@@ -222,15 +232,6 @@ impl LoginSubcommand {
 
         tokio::fs::write(token_path, &token).await?;
 
-        upsert_user_nix_config(
-            &nix_config_path,
-            &netrc_file_string,
-            &netrc_contents,
-            &user_nix_config_addition,
-            &self.cache_addr,
-        )
-        .await?;
-
         let added_nix_config =
             nix_config_parser::NixConfig::parse_string(root_nix_config_addition.clone(), None)?;
         let root_nix_config_path = PathBuf::from("/etc/nix/nix.conf");