From a3030e3c3186f980716c475155c387bf18041a3f Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Thu, 30 Apr 2020 17:56:26 -0600
Subject: [PATCH] fix error calls

---
 src/nix-channel/nix-channel.cc | 30 ++++++++++--------------------
 src/nix-store/nix-store.cc     |  2 +-
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc
index c403e3780..589a061c7 100755
--- a/src/nix-channel/nix-channel.cc
+++ b/src/nix-channel/nix-channel.cc
@@ -37,8 +37,7 @@ static void writeChannels()
 {
     auto channelsFD = AutoCloseFD{open(channelsList.c_str(), O_WRONLY | O_CLOEXEC | O_CREAT | O_TRUNC, 0644)};
     if (!channelsFD)
-        throw Error("");
-        // throw SysError("opening '%1%' for writing", channelsList);
+        throw SysError("opening '%1%' for writing", channelsList);
     for (const auto & channel : channels)
         writeFull(channelsFD.get(), channel.second + " " + channel.first + "\n");
 }
@@ -47,11 +46,9 @@ static void writeChannels()
 static void addChannel(const string & url, const string & name)
 {
     if (!regex_search(url, std::regex("^(file|http|https)://")))
-        throw Error("");
-        // throw Error("invalid channel URL '%1%'", url);
+        throw Error("invalid channel URL '%1%'", url);
     if (!regex_search(name, std::regex("^[a-zA-Z0-9_][a-zA-Z0-9_\\.-]*$")))
-        throw Error("");
-        // throw Error("invalid channel identifier '%1%'", name);
+        throw Error("invalid channel identifier '%1%'", name);
     readChannels();
     channels[name] = url;
     writeChannels();
@@ -143,11 +140,9 @@ static void update(const StringSet & channelNames)
         if (S_ISLNK(st.st_mode))
             // old-skool ~/.nix-defexpr
             if (unlink(nixDefExpr.c_str()) == -1)
-                throw Error("");
-        //         throw SysError("unlinking %1%", nixDefExpr);
+                throw SysError("unlinking %1%", nixDefExpr);
     } else if (errno != ENOENT) {
-        throw Error("");
-        // throw SysError("getting status of %1%", nixDefExpr);
+        throw SysError("getting status of %1%", nixDefExpr);
     }
     createDirs(nixDefExpr);
     auto channelLink = nixDefExpr + "/channels";
@@ -199,12 +194,10 @@ static int _main(int argc, char ** argv)
 
         switch (cmd) {
             case cNone:
-                throw Error("");
-        //         throw UsageError("no command specified");
+                throw UsageError("no command specified");
             case cAdd:
                 if (args.size() < 1 || args.size() > 2)
-                    throw Error("");
-        //             throw UsageError("'--add' requires one or two arguments");
+                    throw UsageError("'--add' requires one or two arguments");
                 {
                 auto url = args[0];
                 std::string name;
@@ -220,14 +213,12 @@ static int _main(int argc, char ** argv)
                 break;
             case cRemove:
                 if (args.size() != 1)
-                    throw Error("");
-        //             throw UsageError("'--remove' requires one argument");
+                    throw UsageError("'--remove' requires one argument");
                 removeChannel(args[0]);
                 break;
             case cList:
                 if (!args.empty())
-                    throw Error("");
-        //             throw UsageError("'--list' expects no arguments");
+                    throw UsageError("'--list' expects no arguments");
                 readChannels();
                 for (const auto & channel : channels)
                     std::cout << channel.first << ' ' << channel.second << '\n';
@@ -237,8 +228,7 @@ static int _main(int argc, char ** argv)
                 break;
             case cRollback:
                 if (args.size() > 1)
-                    throw Error("");
-        //             throw UsageError("'--rollback' has at most one argument");
+                    throw UsageError("'--rollback' has at most one argument");
                 Strings envArgs{"--profile", profile};
                 if (args.size() == 1) {
                     envArgs.push_back("--switch-generation");
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index e4dd9bc96..1e8a88a7b 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -906,7 +906,7 @@ static void opServe(Strings opFlags, Strings opArgs)
 
                 if (!writeAllowed) throw Error("building paths is not allowed");
 
-                auto drvPath = store->parseStorePath(readString(in)); // inonal ony
+                auto drvPath = store->parseStorePath(readString(in)); // informational only
                 BasicDerivation drv;
                 readDerivation(in, *store, drv);