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

Simplify

Browse source
This commit is contained in:
Eelco Dolstra 2019-09-20 16:06:49 +02:00
parent 5a0e98d1e5
commit 14d3f45009
1 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nix/installables.cc
View file

@ -425,29 +425,15 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
getDefaultFlakeAttrPathPrefixes())); getDefaultFlakeAttrPathPrefixes()));
else { else {
std::exception_ptr flakeEx;
try { try {
auto flakeRef = FlakeRef(s, true); auto flakeRef = FlakeRef(s, true);
result.push_back(std::make_shared<InstallableFlake>( result.push_back(std::make_shared<InstallableFlake>(
*this, std::move(flakeRef), getDefaultFlakeAttrPaths())); *this, std::move(flakeRef), getDefaultFlakeAttrPaths()));
continue; } catch (...) {
} catch (MissingFlake &) { if (s.find('/') != std::string::npos && (storePath = follow(s)))
/* 's' could be parsed as a flakeref, but it result.push_back(std::make_shared<InstallableStorePath>(*storePath));
references a local path that is not a flake. So
take note of that. */
flakeEx = std::current_exception();
} catch (BadFlakeRef &) {
}
if (s.find('/') != std::string::npos && (storePath = follow(s)))
result.push_back(std::make_shared<InstallableStorePath>(*storePath));
else {
if (flakeEx)
std::rethrow_exception(flakeEx);
else else
throw Error("unsupported argument '%s'", s); throw;
} }
} }
} }