maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/derivation): add validate_output_paths flag for validate

Browse source 
This allows calling validate() on a derivation that doesn't have its
output paths already calculated yet. It allows offloading some of the
error checking in builtins.derivation* to be offloaded to that function.

Change-Id: Ib4aeadc0eb6583ef8cd765f33e9a9ec32be62729
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7848
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-01-16 15:55:16 +01:00 • committed by flokli
parent b1e8fe7212
commit 083e24bbb1
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tvix/derivation/src/output.rs
View file

@ -24,10 +24,12 @@ impl Output {
self.hash.is_some()
}
pub fn validate(&self) -> Result<(), OutputError> {
pub fn validate(&self, validate_output_paths: bool) -> Result<(), OutputError> {
// TODO: add validation for hash, hashAlgo
if let Err(e) = StorePath::from_absolute_path(&self.path) {
return Err(OutputError::InvalidOutputPath(self.path.to_string(), e));
if validate_output_paths {
if let Err(e) = StorePath::from_absolute_path(&self.path) {
return Err(OutputError::InvalidOutputPath(self.path.to_string(), e));
}
}
Ok(())
}