diff options
author | Florian Klink <flokli@flokli.de> | 2023-12-31T16·54+0200 |
---|---|---|
committer | clbot <clbot@tvl.fyi> | 2024-01-01T00·52+0000 |
commit | fdd7817aad18346197a521593bdafdae4045aeb6 (patch) | |
tree | 8fe76c1d68966eb88a7ca175a9038004eee9583c /tvix/store/src/bin | |
parent | 20c98a51bf36ff6e74c4e62275ff31e7c43802c3 (diff) |
feat(nix-compat/store_path): build_ca_path may fail r/7299
Change-Id: Ia74ee870f38b7966501458bace541092256c3213 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10509 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/store/src/bin')
-rw-r--r-- | tvix/store/src/bin/tvix-store.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tvix/store/src/bin/tvix-store.rs b/tvix/store/src/bin/tvix-store.rs index ab80415cf2e5..ef66d6b7bab1 100644 --- a/tvix/store/src/bin/tvix-store.rs +++ b/tvix/store/src/bin/tvix-store.rs @@ -283,8 +283,16 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { let (nar_size, nar_sha256) = path_info_service.calculate_nar(&root_node).await?; + // Calculate the output path. This might still fail, as some names are illegal. let output_path = - store_path::build_nar_based_store_path(&nar_sha256, name); + store_path::build_nar_based_store_path(&nar_sha256, name).map_err( + |_| { + std::io::Error::new( + std::io::ErrorKind::InvalidData, + format!("invalid name: {}", name), + ) + }, + )?; // assemble a new root_node with a name that is derived from the nar hash. let root_node = |