Merge branch 'main' into feat/py-ratter-release-ci

conda · Oct 5, 2023 · 60f270a · 60f270a
2 parents bb9e7ff + 475d953
commit 60f270a
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/crates/rattler_networking/src/authentication_storage/storage.rs b/crates/rattler_networking/src/authentication_storage/storage.rs
@@ -105,17 +105,16 @@ impl AuthenticationStorage {
                 return Ok(None);
             }
             Err(e) => {
-                tracing::warn!(
-                    "Error retrieving credentials for {}: {}, using fallback storage at {}",
+                tracing::debug!(
+                    "Unable to retrieve credentials for {}: {}, using fallback credential storage at {}",
                     host,
                     e,
                     self.fallback_storage.path.display()
                 );
-                let fb_pw = self.fallback_storage.get_password(host)?;
-                if fb_pw.is_none() {
-                    return Ok(None);
+                match self.fallback_storage.get_password(host)? {
+                    None => return Ok(None),
+                    Some(password) => password,
                 }
-                fb_pw.unwrap()
             }
         };