From: Tobias Ulmer <tu@emlix.com>
Date: Tue, 30 Aug 2016 16:10:55 +0000 (+0200)
Subject: e2tool: sprinkle asserts and fix indentation
X-Git-Tag: e2factory-2.3.15rc1~128
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=4577744b1b4798c4e49148cea75e2e9e6fa2a124;p=e2factory.git

e2tool: sprinkle asserts and fix indentation

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

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 952746b..9ad5375 100644
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -354,6 +354,8 @@ end
 -- @param prefix Optional prefix path.
 -- @return Path to the resultconfig.
 function e2tool.resultconfig(name, prefix)
+    assert(type(name) == "string")
+    assert(prefix == nil or type(prefix) == "string")
     return e2lib.join(e2tool.resultdir(name, prefix), "config")
 end
 
@@ -362,6 +364,8 @@ end
 -- @param prefix Optional prefix path.
 -- @return Path to the result build-script.
 function e2tool.resultbuildscript(name, prefix)
+    assert(type(name) == "string")
+    assert(prefix == nil or type(prefix) == "string")
     return e2lib.join(e2tool.resultdir(name, prefix), "build-script")
 end
 
@@ -370,6 +374,8 @@ end
 -- @param prefix Optional prefix path.
 -- @return Path to the sourceconfig.
 function e2tool.sourceconfig(name, prefix)
+    assert(type(name) == "string")
+    assert(prefix == nil or type(prefix) == "string")
     return e2lib.join(e2tool.sourcedir(name, prefix), "config")
 end
 
@@ -809,7 +815,7 @@ end
 local function verify_remote_fileid(info, file, fileid)
     local rc, re, hc
     local e = err.new("error calculating remote file id for file: %s:%s",
-    file.server, file.location)
+        file.server, file.location)
     if not cache.cache_enabled(info.cache, file.server) or
         not e2option.opts["check-remote"] then
         e2lib.logf(4, "checksum for remote file %s:%s skip verifying",
@@ -892,7 +898,7 @@ local function verify_remote_fileid(info, file, fileid)
         file.server, file.location, remote_fileid, fileid)
     end
     e2lib.logf(4, "checksum for remote file %s:%s matches (%s)",
-    file.server, file.location, fileid)
+        file.server, file.location, fileid)
     return true
 end