mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for name collisions in the input Nix expressions

Browse source
This commit is contained in:
Eelco Dolstra 2013-09-03 15:25:51 +02:00
parent ef4f5ba85e
commit c57ed84e28
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nix-env/nix-env.cc
View file

@ -101,7 +101,7 @@ static bool isNixExpr(const Path & path, struct stat & st)
static void getAllExprs(EvalState & state, static void getAllExprs(EvalState & state,
const Path & path, Value & v) const Path & path, StringSet & attrs, Value & v)
{ {
Strings names = readDirectory(path); Strings names = readDirectory(path);
StringSet namesSorted(names.begin(), names.end()); StringSet namesSorted(names.begin(), names.end());
@ -126,6 +126,11 @@ static void getAllExprs(EvalState & state,
string attrName = *i; string attrName = *i;
if (hasSuffix(attrName, ".nix")) if (hasSuffix(attrName, ".nix"))
attrName = string(attrName, 0, attrName.size() - 4); attrName = string(attrName, 0, attrName.size() - 4);
if (attrs.find(attrName) != attrs.end()) {
printMsg(lvlError, format("warning: name collision in input Nix expressions, skipping `%1%'") % path2);
continue;
}
attrs.insert(attrName);
// FIXME: make loading lazy. // FIXME: make loading lazy.
Value & v2(*state.allocAttr(v, state.symbols.create(attrName))); Value & v2(*state.allocAttr(v, state.symbols.create(attrName)));
state.evalFile(path2, v2); state.evalFile(path2, v2);
@ -133,7 +138,7 @@ static void getAllExprs(EvalState & state,
else if (S_ISDIR(st.st_mode)) else if (S_ISDIR(st.st_mode))
/* `path2' is a directory (with no default.nix in it); /* `path2' is a directory (with no default.nix in it);
recurse into it. */ recurse into it. */
getAllExprs(state, path2, v); getAllExprs(state, path2, attrs, v);
} }
} }
@ -158,7 +163,8 @@ static void loadSourceExpr(EvalState & state, const Path & path, Value & v)
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
state.mkAttrs(v, 16); state.mkAttrs(v, 16);
state.mkList(*state.allocAttr(v, state.symbols.create("_combineChannels")), 0); state.mkList(*state.allocAttr(v, state.symbols.create("_combineChannels")), 0);
getAllExprs(state, path, v); StringSet attrs;
getAllExprs(state, path, attrs, v);
v.attrs->sort(); v.attrs->sort();
} }
} }