From owner-svn-src-all@freebsd.org Mon Feb 19 17:01:22 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AC31F102BF; Mon, 19 Feb 2018 17:01:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E28247F357; Mon, 19 Feb 2018 17:01:21 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DD5661D41D; Mon, 19 Feb 2018 17:01:21 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1JH1LgG019394; Mon, 19 Feb 2018 17:01:21 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JH1LY9019393; Mon, 19 Feb 2018 17:01:21 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802191701.w1JH1LY9019393@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 19 Feb 2018 17:01:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329590 - head/stand/lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/stand/lua X-SVN-Commit-Revision: 329590 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Feb 2018 17:01:22 -0000 Author: kevans Date: Mon Feb 19 17:01:21 2018 New Revision: 329590 URL: https://svnweb.freebsd.org/changeset/base/329590 Log: stand/lua: Restore environment upon config reload This restores environment to whatever defaults we had coming into lualoader. Modified: head/stand/lua/config.lua Modified: head/stand/lua/config.lua ============================================================================== --- head/stand/lua/config.lua Mon Feb 19 16:59:28 2018 (r329589) +++ head/stand/lua/config.lua Mon Feb 19 17:01:21 2018 (r329590) @@ -34,6 +34,20 @@ config.env_restore = {}; local modules = {}; +function config.restoreEnv() + for k, v in pairs(config.env_changed) do + local restore_value = config.env_restore[k]; + if (restore_value ~= nil) then + loader.setenv(k, restore_value); + else + loader.unsetenv(k); + end + end + + config.env_changed = {}; + config.env_restore = {}; +end + function config.setenv(k, v) -- Do we need to track this change? if (config.env_changed[k] == nil) then @@ -391,6 +405,7 @@ function config.reload(file) -- XXX TODO: We should be doing something more here to clear out env -- changes that rode in with the last configuration load modules = {}; + config.restoreEnv(); config.load(file); end