itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #12440 - arlosi:fix-token-read, r=weihanglo

Browse Source 
Don't attempt to read a token from stdin if a cmdline token is provided

Fixes #12438
This commit is contained in:
bors 2023-08-03 06:50:25 +00:00
commit 336b4437a4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cargo/ops/registry/login.rs
View File

@ -35,13 +35,15 @@ pub fn registry_login(
};
let mut token_from_stdin = None;
if !std::io::stdin().is_terminal() {
let token = std::io::read_to_string(std::io::stdin()).unwrap_or_default();
if !token.is_empty() {
token_from_stdin = Some(token);
let token = token_from_cmdline.or_else(|| {
if !std::io::stdin().is_terminal() {
let token = std::io::read_to_string(std::io::stdin()).unwrap_or_default();
if !token.is_empty() {
token_from_stdin = Some(token);
}
}
}
let token = token_from_cmdline.or_else(|| token_from_stdin.as_deref().map(Secret::from));
token_from_stdin.as_deref().map(Secret::from)
});
let options = LoginOptions {
token,