diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-04-18 16:51:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-18 16:51:46 +0200 |
| commit | 67fe3e07b2069c27484d6817d05d9190e70c518c (patch) | |
| tree | 85df073fc6c320c415cfcfb5816c30ca981d9b76 /src | |
| parent | f8a2e8a55203f2cc16d70ad43afcc186adaab6b3 (diff) | |
| parent | 503cc4431b8fa008caca7d06026dcfcab8626884 (diff) | |
Merge pull request #1321 from shlevy/channel-direct-tarball-error
nix-channel: error out if direct tarball unpack fails.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/nix-channel/nix-channel.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc index 361627823..0f50f6242 100755 --- a/src/nix-channel/nix-channel.cc +++ b/src/nix-channel/nix-channel.cc @@ -103,12 +103,9 @@ static void update(const StringSet & channelNames) auto unpacked = false; 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> " - "{ name = \"" + cname + "\"; channelName = \"" + name + "\"; src = builtins.storePath \"" + filename + "\"; }" }); - unpacked = true; - } catch (ExecError & e) { - } + runProgram(settings.nixBinDir + "/nix-build", false, { "--no-out-link", "--expr", "import <nix/unpack-channel.nix> " + "{ name = \"" + cname + "\"; channelName = \"" + name + "\"; src = builtins.storePath \"" + filename + "\"; }" }); + unpacked = true; } if (!unpacked) { |