From: Tobias Ulmer <tu@emlix.com>
Date: Tue, 15 Apr 2014 16:02:00 +0000 (+0200)
Subject: Simplify generic_source_default_working()
X-Git-Tag: e2factory-2.3.15rc1~207
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=c7ea6df2f33302074470eb27e1835db90f2d19bc;p=e2factory.git

Simplify generic_source_default_working()

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

diff --git a/local/scm.lua b/local/scm.lua
index 43b9968..cb38345 100644
--- a/local/scm.lua
+++ b/local/scm.lua
@@ -239,24 +239,18 @@ end
 -- @return bool
 -- @return an error object on failure
 function scm.generic_source_default_working(info, sourcename)
-    local src = info.sources[ sourcename ]
-    if src.working_default_applied then
-        return true
-    end
-    src.working_default_applied = true
-    local src_working_default = string.format("in/%s", sourcename)
-    if src.working and src.working ~= src_working_default then
-        e2lib.warnf("WPOLICY", "in source %s:", src.name)
-        e2lib.warnf("WPOLICY", " configuring non standard working direcory")
-    elseif src.working then
-        e2lib.warnf("WHINT", "in source %s:", src.name)
-        e2lib.warnf("WHINT", " no need to configure working directory")
-    else
-        src.working = string.format("in/%s", sourcename)
-        e2lib.warnf("WDEFAULT", "in source %s:", src.name)
-        e2lib.warnf("WDEFAULT",
-        " `working' attribute missing. Defaulting to '%s'.", src.working)
+    local src
+
+    src = info.sources[sourcename]
+
+    if not src.working then
+        src.working = e2lib.join("in", sourcename)
+
+        e2lib.warnf("WDEFAULT", "in source %s:", sourcename)
+        e2lib.warnf("WDEFAULT", " `working' attribute defaults to '%s'.",
+            src.working)
     end
+
     return true
 end