From 04af54090ed7f67b95a0d6749ad0ac5acea84518 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 17 Sep 2024 17:23:44 -0400 Subject: [PATCH] Notify the user with an info if we're ignoring their netrc --- magic-nix-cache/src/main.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/magic-nix-cache/src/main.rs b/magic-nix-cache/src/main.rs index 77675b9..d7848b1 100644 --- a/magic-nix-cache/src/main.rs +++ b/magic-nix-cache/src/main.rs @@ -245,7 +245,11 @@ async fn main_cli() -> Result<()> { let narinfo_negative_cache = Arc::new(RwLock::new(HashSet::new())); let auth_method: FlakeHubAuthSource = match (args.flakehub_api_server_netrc, dnixd_available) { - (_, true) => FlakeHubAuthSource::DeterminateNixd, + (None, true) => FlakeHubAuthSource::DeterminateNixd, + (Some(_), true) => { + tracing::info!("Ignoring the user-specified --flakehub-api-server-netrc, in favor of the determinate-nixd netrc"); + FlakeHubAuthSource::DeterminateNixd + } (Some(path), false) => FlakeHubAuthSource::Netrc(path), (None, false) => { return Err(anyhow!(