From e36d6839d19a669d85ad424aa722d16abd8fc219 Mon Sep 17 00:00:00 2001
From: Erik Johnson <palehose@gmail.com>
Date: Thu, 1 Sep 2016 22:53:40 -0500
Subject: [PATCH] Two fixes in _get_envs()

1. Don't get client_envs twice.
2. Don't add 'base' more than once.
---
 salt/state.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/state.py b/salt/state.py
index 5174ad823a..2c3abdd8a1 100644
--- a/salt/state.py
+++ b/salt/state.py
@@ -2505,8 +2505,8 @@ class BaseHighState(object):
         '''
         envs = ['base']
         if 'file_roots' in self.opts:
-            envs.extend(list(self.opts['file_roots']))
-        client_envs = self.client.envs()
+            envs.extend([x for x in list(self.opts['file_roots'])
+                         if x not in envs])
         env_order = self.opts.get('env_order', [])
         client_envs = self.client.envs()
         if env_order and client_envs: