From e9506e80cb696cc5b2a18889965404774104fcea Mon Sep 17 00:00:00 2001 From: Kazuhiro NISHIYAMA Date: Fri, 3 Nov 2017 13:27:23 +0900 Subject: [PATCH] Reduce loading global env --- plugins/config/subcommands.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/config/subcommands.go b/plugins/config/subcommands.go index a5b564933..dc35bcf3b 100644 --- a/plugins/config/subcommands.go +++ b/plugins/config/subcommands.go @@ -136,15 +136,14 @@ func CommandBundle(args []string, global bool, merged bool) { //getEnvironment for the given app (global config if appName is empty). Merge with global environment if merged is true. func getEnvironment(appName string, merged bool) (env *Env) { - env, err := loadAppOrGlobalEnv(appName) - if err != nil { - common.LogFail(err.Error()) - } + var err error if appName != "" && merged { env, err = LoadMergedAppEnv(appName) - if err != nil { - common.LogFail(err.Error()) - } + } else { + env, err = loadAppOrGlobalEnv(appName) + } + if err != nil { + common.LogFail(err.Error()) } return env }