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

Make "fetchGit /path" work

Browse source
This commit is contained in:
Eelco Dolstra 2017-10-30 13:18:28 +01:00
parent a5c392a80e
commit 63c80ae26f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr/primops/fetchgit.cc
View file

@ -117,6 +117,7 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
std::string ref = "master"; std::string ref = "master";
std::string rev; std::string rev;
std::string name = "source"; std::string name = "source";
PathSet context;
state.forceValue(*args[0]); state.forceValue(*args[0]);
@ -126,11 +127,8 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
for (auto & attr : *args[0]->attrs) { for (auto & attr : *args[0]->attrs) {
string n(attr.name); string n(attr.name);
if (n == "url") { if (n == "url")
PathSet context;
url = state.coerceToString(*attr.pos, *attr.value, context, false, false); url = state.coerceToString(*attr.pos, *attr.value, context, false, false);
if (hasPrefix(url, "/")) url = "file://" + url;
}
else if (n == "ref") else if (n == "ref")
ref = state.forceStringNoCtx(*attr.value, *attr.pos); ref = state.forceStringNoCtx(*attr.value, *attr.pos);
else if (n == "rev") else if (n == "rev")
@ -145,7 +143,9 @@ static void prim_fetchGit(EvalState & state, const Pos & pos, Value * * args, Va
throw EvalError(format("'url' argument required, at %1%") % pos); throw EvalError(format("'url' argument required, at %1%") % pos);
} else } else
url = state.forceStringNoCtx(*args[0], pos); url = state.coerceToString(pos, *args[0], context, false, false);
if (hasPrefix(url, "/")) url = "file://" + url;
// FIXME: git externals probably can be used to bypass the URI // FIXME: git externals probably can be used to bypass the URI
// whitelist. Ah well. // whitelist. Ah well.