From: Tobias Ulmer <tu@emlix.com>
Date: Tue, 9 Apr 2019 14:15:05 +0000 (+0200)
Subject: git: _check_git_remote: don't fail with unrelated msg if remote doesn't exist
X-Git-Tag: e2factory-2.3.18rc1~12
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=ebbb57507a9d5b6fc1ac7d4a3a7bc620559c7905;p=e2factory.git

git: _check_git_remote: don't fail with unrelated msg if remote doesn't exist

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

diff --git a/plugins/git.lua b/plugins/git.lua
index 159f702..90843c5 100644
--- a/plugins/git.lua
+++ b/plugins/git.lua
@@ -377,11 +377,17 @@ function git.git_source:_check_git_remote()
     remote = generic_git.the_remote()
     query = string.format("remote.%s.url", remote)
     gitdir = e2lib.join(e2tool.root(), self:get_working(), ".git")
-    url, re = generic_git.git_config(gitdir, query)
-    if not url then
+
+    result, re = generic_git.git_config_table(gitdir)
+    if not result then
         return false, re
     end
 
+    url = result[query]
+    if not url then
+        return false, err.new("no git remote %q configured", remote)
+    end
+
     local function remove_trailing_slashes(s)
         while s:sub(#s) == "/" do
             s = s:sub(1, #s-1)