lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix applyOverride() for github

Browse source
This commit is contained in:
Eelco Dolstra 2020-06-09 13:45:07 +02:00
parent 1205b41849
commit 6cfc2db494
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/flake/flake.cc
View file

@ -57,7 +57,7 @@ static std::tuple<fetchers::Tree, FlakeRef, FlakeRef> fetchOrSubstituteTree(
} }
flakeCache.push_back({originalRef, fetched.value()}); flakeCache.push_back({originalRef, fetched.value()});
} }
auto [tree, lockedRef] = fetched.value(); auto [tree, lockedRef] = fetched.value();
debug("got tree '%s' from '%s'", debug("got tree '%s' from '%s'",

1
src/libfetchers/fetchers.cc
View file

@ -91,6 +91,7 @@ bool Input::operator ==(const Input & other) const
bool Input::contains(const Input & other) const bool Input::contains(const Input & other) const
{ {
if (*this == other) return true;
auto other2(other); auto other2(other);
other2.attrs.erase("ref"); other2.attrs.erase("ref");
other2.attrs.erase("rev"); other2.attrs.erase("rev");

8
src/libfetchers/github.cc
View file

@ -59,7 +59,7 @@ struct GitArchiveInputScheme : InputScheme
} }
if (ref && rev) if (ref && rev)
throw BadURL("URL '%s' contains both a commit hash and a branch/tag name", url.url); throw BadURL("URL '%s' contains both a commit hash and a branch/tag name %s %s", url.url, *ref, rev->gitRev());
Input input; Input input;
input.attrs.insert_or_assign("type", type()); input.attrs.insert_or_assign("type", type());
@ -115,14 +115,16 @@ struct GitArchiveInputScheme : InputScheme
std::optional<Hash> rev) override std::optional<Hash> rev) override
{ {
auto input(_input); auto input(_input);
if (rev && ref)
throw BadURL("cannot apply both a commit hash (%s) and a branch/tag name ('%s') to input '%s'",
rev->gitRev(), *ref, input.to_string());
if (rev) { if (rev) {
input.attrs.insert_or_assign("rev", rev->gitRev()); input.attrs.insert_or_assign("rev", rev->gitRev());
input.attrs.erase("ref"); input.attrs.erase("ref");
} }
if (ref) { if (ref) {
if (input.getRev())
throw BadURL("input '%s' contains both a commit hash and a branch/tag name", input.to_string());
input.attrs.insert_or_assign("ref", *ref); input.attrs.insert_or_assign("ref", *ref);
input.attrs.erase("rev");
} }
return input; return input;
} }