fix: properly fall back to netrc file (#592)

We were early-exiting the loop.
conda · Apr 5, 2024 · 5483bf9 · 5483bf9
1 parent 9f8d396
commit 5483bf9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/crates/rattler_networking/src/authentication_storage/backends/netrc.rs b/crates/rattler_networking/src/authentication_storage/backends/netrc.rs
@@ -39,6 +39,9 @@ impl NetRcStorage {
             Ok(val) => PathBuf::from(val),
             Err(_) => match dirs::home_dir() {
                 Some(mut path) => {
+                    #[cfg(windows)]
+                    path.push("_netrc");
+                    #[cfg(not(windows))]
                     path.push(".netrc");
                     path
                 }

diff --git a/crates/rattler_networking/src/authentication_storage/storage.rs b/crates/rattler_networking/src/authentication_storage/storage.rs
@@ -92,15 +92,15 @@ impl AuthenticationStorage {
                     return Ok(Some(auth));
                 }
                 Ok(None) => {
-                    return Ok(None);
+                    continue;
                 }
                 Err(e) => {
                     tracing::warn!("Error retrieving credentials from backend: {}", e);
                 }
             }
         }
 
-        Err(anyhow!("All backends failed to retrieve credentials"))
+        Ok(None)
     }
 
     /// Retrieve the authentication information for the given URL