From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 27 Sep 2013 16:41:32 +0000 (+0200)
Subject: Remove E2_LOCAL_TAG and E2_LOCAL_BRANCH environment variables
X-Git-Tag: e2factory-2.3.15rc1~453
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=154832237c2ffabd278e01ae66a41c8b5fc87d61;p=e2factory.git

Remove E2_LOCAL_TAG and E2_LOCAL_BRANCH environment variables

Looks like these were initially used for automated tests.  The same
settings can now be made in e2.conf.

Nothing that I know of has known or used these environment variables, so
I consider it OK to "break" backwards compat.

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

diff --git a/doc/man/e2-create-project.1.in b/doc/man/e2-create-project.1.in
index 6c44531..34c7a0d 100644
--- a/doc/man/e2-create-project.1.in
+++ b/doc/man/e2-create-project.1.in
@@ -32,16 +32,6 @@ Create a new project:
 e2-create-project foo/bar
 .fi
 
-.SH ENVIRONMENT
-Following environment variables are evaluated:
-.TP
-.BR E2_LOCAL_BRANCH
-Branch of version of e2factory to be used.
-.TP
-.BR E2_LOCAL_TAG
-Tag of version of e2factory to be used.
-
-
 .SH SEE ALSO
 .BR e2factory(1)
 
diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 9a616ef..127f365 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -86,8 +86,6 @@ e2lib.globals = {
     tmpfiles = {},
     default_projects_server = "projects",
     default_project_version = "2",
-    local_e2_branch = nil,
-    local_e2_tag = nil,
     --- command line arguments that influence global settings are stored here
     -- @class table
     -- @name cmdline
@@ -376,8 +374,6 @@ function e2lib.init()
         { name = "E2TMPDIR", required = false },
         { name = "COLUMNS", required = false, default = "72" },
         { name = "E2_SSH", required = false },
-        { name = "E2_LOCAL_BRANCH", required = false },
-        { name = "E2_LOCAL_TAG", required = false },
     }
 
     local osenv = {}
diff --git a/global/e2-create-project.lua b/global/e2-create-project.lua
index 6487b1c..4667e56 100644
--- a/global/e2-create-project.lua
+++ b/global/e2-create-project.lua
@@ -67,36 +67,20 @@ local function e2_create_project(arg)
         return false, e:cat(re)
     end
 
-    -- standard global tool setup finished
-
-    if e2lib.globals.osenv["E2_LOCAL_TAG"] and e2lib.globals.osenv["E2_LOCAL_BRANCH"] then
-        e2lib.globals.local_e2_branch = e2lib.globals.osenv["E2_LOCAL_BRANCH"]
-        e2lib.globals.local_e2_tag = e2lib.globals.osenv["E2_LOCAL_TAG"]
-    elseif e2lib.globals.osenv["E2_LOCAL_TAG"] then
-        e2lib.globals.local_e2_branch = "-"
-        e2lib.globals.local_e2_tag = e2lib.globals.osenv["E2_LOCAL_TAG"]
-    elseif e2lib.globals.osenv["E2_LOCAL_BRANCH"] then
-        e2lib.globals.local_e2_branch = e2lib.globals.osenv["E2_LOCAL_BRANCH"]
-        e2lib.globals.local_e2_tag = "^"
-    else
-        e2lib.globals.local_e2_branch = config.site.e2_branch
-        e2lib.globals.local_e2_tag =  config.site.e2_tag
-    end
-
     if #arguments ~= 1 then
         e2option.usage(1)
     end
 
     local sl, re = e2lib.parse_server_location(arguments[1],
-    e2lib.globals.default_projects_server)
+        e2lib.globals.default_projects_server)
     if not sl then
         return false, e:cat(re)
     end
 
     local p = {}
     p.version = buildconfig.GLOBAL_INTERFACE_VERSION[1] -- the project version
-    p.e2version = string.format("%s %s", e2lib.globals.local_e2_branch,
-    e2lib.globals.local_e2_tag)
+    p.e2version = string.format("%s %s",
+        config.site.e2_branch, config.site.e2_tag)
     p.server = sl.server				-- the server
     p.location = sl.location			-- the project location
     p.name = e2lib.basename(sl.location)		-- the project basename