mirrors/magic-nix-cache
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

netrc: cli arg is truly optional, defaults to UDS path

Browse source
This commit is contained in:
Cole Mickens 2024-08-29 09:28:16 -07:00
parent 08c8cf0275
commit 11544ed9eb
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
magic-nix-cache/src/main.rs
View file

@ -219,9 +219,18 @@ async fn main_cli() -> Result<()> {
let flakehub_cache_server = args let flakehub_cache_server = args
.flakehub_cache_server .flakehub_cache_server
.ok_or_else(|| anyhow!("--flakehub-cache-server is required"))?; .ok_or_else(|| anyhow!("--flakehub-cache-server is required"))?;
let flakehub_api_server_netrc = args
.flakehub_api_server_netrc let flakehub_api_server_netrc = if dnixd_available {
.ok_or_else(|| anyhow!("--flakehub-api-server-netrc is required"))?; let dnixd_netrc_path = PathBuf::from(DETERMINATE_STATE_DIR).join("netrc");
args.flakehub_api_server_netrc.unwrap_or(dnixd_netrc_path)
} else {
args.flakehub_api_server_netrc.ok_or_else(|| {
anyhow!(
"--flakehub-api-server-netrc is required when determinate-nixd is unavailable"
)
})?
};
let flakehub_flake_name = args.flakehub_flake_name; let flakehub_flake_name = args.flakehub_flake_name;
match flakehub::init_cache( match flakehub::init_cache(