From 14d3f450098e0f4a9b8d538545f1d1bd1decdab3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 20 Sep 2019 16:06:49 +0200
Subject: [PATCH] Simplify

---
 src/nix/installables.cc | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index 987b744fe..85005cc95 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -425,29 +425,15 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
                         getDefaultFlakeAttrPathPrefixes()));
 
             else {
-                std::exception_ptr flakeEx;
-
                 try {
                     auto flakeRef = FlakeRef(s, true);
                     result.push_back(std::make_shared<InstallableFlake>(
                             *this, std::move(flakeRef), getDefaultFlakeAttrPaths()));
-                    continue;
-                } catch (MissingFlake &) {
-                    /* 's' could be parsed as a flakeref, but it
-                       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);
+                } catch (...) {
+                    if (s.find('/') != std::string::npos && (storePath = follow(s)))
+                        result.push_back(std::make_shared<InstallableStorePath>(*storePath));
                     else
-                        throw Error("unsupported argument '%s'", s);
+                        throw;
                 }
             }
         }