guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: daemon: Replace "illegal" by "invalid" in error messages.


From: guix-commits
Subject: 02/02: daemon: Replace "illegal" by "invalid" in error messages.
Date: Wed, 12 Jun 2019 18:44:19 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 76533c52c06de4823738b32e450a1a06522018d1
Author: Ludovic Court├Ęs <address@hidden>
Date:   Wed Jun 12 23:11:37 2019 +0200

    daemon: Replace "illegal" by "invalid" in error messages.
    
    * nix/libstore/build.cc (parseReferenceSpecifiers): Replace "illegal" by
    "invalid".
    * nix/libstore/globals.cc (Settings::pack): Likewise.
    * nix/libstore/store-api.cc (checkStoreName): Likewise.
---
 nix/libstore/build.cc     | 2 +-
 nix/libstore/globals.cc   | 2 +-
 nix/libstore/store-api.cc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 06bc760..fe7bf79 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -2348,7 +2348,7 @@ PathSet parseReferenceSpecifiers(const Derivation & drv, 
string attr)
         else if (drv.outputs.find(*i) != drv.outputs.end())
             result.insert(drv.outputs.find(*i)->second.path);
         else throw BuildError(
-            format("derivation contains an illegal reference specifier `%1%'")
+            format("derivation contains an invalid reference specifier `%1%'")
             % *i);
     }
     return result;
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index 69f6d06..6df20e7 100644
--- a/nix/libstore/globals.cc
+++ b/nix/libstore/globals.cc
@@ -196,7 +196,7 @@ string Settings::pack()
         if (i->first.find('\n') != string::npos ||
             i->first.find('=') != string::npos ||
             i->second.find('\n') != string::npos)
-            throw Error("illegal option name/value");
+            throw Error("invalid option name/value");
         s += i->first; s += '='; s += i->second; s += '\n';
     }
     return s;
diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc
index 709d17e..0de0b6b 100644
--- a/nix/libstore/store-api.cc
+++ b/nix/libstore/store-api.cc
@@ -61,7 +61,7 @@ void checkStoreName(const string & name)
     /* Disallow names starting with a dot for possible security
        reasons (e.g., "." and ".."). */
     if (string(name, 0, 1) == ".")
-        throw Error(format("illegal name: `%1%'") % name);
+        throw Error(format("invalid name: `%1%'") % name);
     foreach (string::const_iterator, i, name)
         if (!((*i >= 'A' && *i <= 'Z') ||
               (*i >= 'a' && *i <= 'z') ||



reply via email to

[Prev in Thread] Current Thread [Next in Thread]