From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 15 Nov 2013 11:39:21 +0000 (+0100)
Subject: Repair error reporting in e2lib.wait()
X-Git-Tag: e2factory-2.3.15rc1~384
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=0329ed182f9e1225dec3e5578c65024c37de0a81;p=e2factory.git

Repair error reporting in e2lib.wait()

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

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index bdefd4e..230ecf8 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -200,14 +200,13 @@ end
 -- @return Exit status of process (WEXITSTATUS), or false on error.
 -- @return Process ID of the terminated child or error object on failure.
 function e2lib.wait(pid)
-    local rc, pid = le2lib.wait(pid)
+    local rc, childpid = le2lib.wait(pid)
 
     if not rc then
-        local errstring = pid
-        return false, err.new("waiting for child %d failed: %s", pid, errstring)
+        return false, err.new("waiting for child %d failed: %s", pid, childpid)
     end
 
-    return rc, pid
+    return rc, childpid
 end
 
 --- Poll input output multiplexing.