Replace abort() in guards of dofile2() with error()

Here error() is called in a protected environment. We get an error
message back instead of instantly terminating the program.

Signed-off-by: Tobias Ulmer <tu@emlix.com>

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 99e32251702c66d5a93b054af8f7c56ece469f8d..42ba5e9e472363ec2885e6567ae95a9edf850d5e 100644 (file)
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -1192,12 +1192,15 @@ function e2lib.dofile2(path, gtable, allownewdefs)
         if x then
             return x
         else
-            e2lib.abort(path, ": attempt to reference undefined global variable '", k, "'")
+            error(string.format(
+                "%s: attempt to reference undefined global variable '%s'",
+                path, tostring(k)), 0)
         end
     end
 
     local function checkwrite(t, k, v)
-        e2lib.abort(path, ": attempt to set new global variable `", k, "' to ", v)
+        error(string.format("%s: attempt to set new global variable `%s' to %s",
+            path, tostring(k), tostring(v)), 0)
     end
 
     if not allownewdefs then