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

nix-channel: error out if direct tarball unpack fails.

Browse source 
It's very unlikely a path ending in .tar.gz is a directory

Fixes #1318
This commit is contained in:
Shea Levy 2017-04-10 18:16:36 -04:00
parent 915f62fa19
commit 503cc4431b
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nix-channel/nix-channel.cc
View file

@ -103,12 +103,9 @@ static void update(const StringSet & channelNames)
auto unpacked = false; auto unpacked = false;
if (std::regex_search(filename, std::regex("\\.tar\\.(gz|bz2|xz)$"))) { if (std::regex_search(filename, std::regex("\\.tar\\.(gz|bz2|xz)$"))) {
try {
runProgram(settings.nixBinDir + "/nix-build", false, { "--no-out-link", "--expr", "import <nix/unpack-channel.nix> " runProgram(settings.nixBinDir + "/nix-build", false, { "--no-out-link", "--expr", "import <nix/unpack-channel.nix> "
"{ name = \"" + cname + "\"; channelName = \"" + name + "\"; src = builtins.storePath \"" + filename + "\"; }" }); "{ name = \"" + cname + "\"; channelName = \"" + name + "\"; src = builtins.storePath \"" + filename + "\"; }" });
unpacked = true; unpacked = true;
} catch (ExecError & e) {
}
} }
if (!unpacked) { if (!unpacked) {