nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #8938 from obsidiansystems/better-drv-parsing

Browse source 
Improve derivation parsing
This commit is contained in:
John Ericson 2023-09-07 11:07:02 -04:00 committed by GitHub
parent 3a62651bd6 b7edc2099f
commit 37d6fff113
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libstore/derivations.cc
View file

@ -154,8 +154,9 @@ static void expect(std::istream & str, std::string_view s)
{ {
char s2[s.size()]; char s2[s.size()];
str.read(s2, s.size()); str.read(s2, s.size());
if (std::string(s2, s.size()) != s) std::string_view s2View { s2, s.size() };
throw FormatError("expected string '%1%'", s); if (s2View != s)
throw FormatError("expected string '%s', got '%s'", s, s2View);
} }
@ -223,7 +224,8 @@ static DerivationOutput parseDerivationOutput(const Store & store,
const auto hashType = parseHashType(hashAlgo); const auto hashType = parseHashType(hashAlgo);
if (hashS == "impure") { if (hashS == "impure") {
experimentalFeatureSettings.require(Xp::ImpureDerivations); experimentalFeatureSettings.require(Xp::ImpureDerivations);
assert(pathS == ""); if (pathS != "")
throw FormatError("impure derivation output should not specify output path");
return DerivationOutput::Impure { return DerivationOutput::Impure {
.method = std::move(method), .method = std::move(method),
.hashType = std::move(hashType), .hashType = std::move(hashType),
@ -239,7 +241,8 @@ static DerivationOutput parseDerivationOutput(const Store & store,
}; };
} else { } else {
experimentalFeatureSettings.require(Xp::CaDerivations); experimentalFeatureSettings.require(Xp::CaDerivations);
assert(pathS == ""); if (pathS != "")
throw FormatError("content-addressed derivation output should not specify output path");
return DerivationOutput::CAFloating { return DerivationOutput::CAFloating {
.method = std::move(method), .method = std::move(method),
.hashType = std::move(hashType), .hashType = std::move(hashType),