From: Gordon Hecker <gh@emlix.com>
Date: Thu, 6 May 2010 10:29:33 +0000 (+0200)
Subject: bugfix: use template configuration file for proj/env
X-Git-Tag: e2factory-2.3.6~6
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=e536f71e4848a3302a9a1cb238f3efd74513cc5e;p=e2factory.git

bugfix: use template configuration file for proj/env

Signed-off-by: Gordon Hecker <gh@emlix.com>
---

diff --git a/global/e2-create-project.lua.in b/global/e2-create-project.lua.in
index e955cb6..0343efc 100755
--- a/global/e2-create-project.lua.in
+++ b/global/e2-create-project.lua.in
@@ -164,18 +164,12 @@ local env, re = e2lib.read_template("proj/env")
 if not env then
   e2lib.abort(re)
 end
--- XXX moge pconfig to builtin template table file
-local pconfig = [[
--- e2factory project configuration file --
-
-e2project {
-	name = "%s",
-	release_id = "%s",
-	default_results = { },
-	chroot_arch = "x86_32",
-}
-]]
-pconfig = string.format(pconfig, p.name, p.name)
+local pconfig, re = e2lib.read_template("proj/config")
+if not pconfig then
+  e2lib.abort(re)
+end
+pconfig = pconfig:gsub("<<release_id>>", p.name)
+pconfig = pconfig:gsub("<<name>>", p.name)
 local name = string.format("%s\n", p.name)
 local release_id = string.format("%s\n", p.name) -- use the name for now
 local version = string.format("%s\n", p.version)
diff --git a/templates/proj/config b/templates/proj/config
index e9f37dd..0b9a29f 100644
--- a/templates/proj/config
+++ b/templates/proj/config
@@ -1,7 +1,7 @@
 e2project {
 	-- these must be configured
-	name = "project",
-	release_id = "release-id",
+	name = "<<name>>",
+	release_id = "<<release_id>>",
 	default_results = { },
 	deploy_results = {
 	},