repair some legacy logic agound grain overrides, fix #3882

saltstack · Mar 5, 2013 · a14fdf7 · a14fdf7
1 parent 3171bb1
commit a14fdf7
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/salt/loader.py b/salt/loader.py
@@ -199,25 +199,24 @@ def grains(opts):
     Return the functions for the dynamic grains and the values for the static
     grains.
     '''
-    if not 'grains' in opts:
-        pre_opts = {}
-        pre_opts.update(salt.config.load_config(
-            opts['conf_file'], 'SALT_MINION_CONFIG'
-        ))
-        default_include = pre_opts.get(
-            'default_include', opts['default_include']
-        )
-        include = pre_opts.get('include', [])
-        pre_opts.update(salt.config.include_config(
-            default_include, opts['conf_file'], verbose=False
-        ))
-        pre_opts.update(salt.config.include_config(
-            include, opts['conf_file'], verbose=True
-        ))
-        if 'grains' in pre_opts:
-            opts['grains'] = pre_opts['grains']
-        else:
-            opts['grains'] = {}
+    pre_opts = {}
+    pre_opts.update(salt.config.load_config(
+        opts['conf_file'], 'SALT_MINION_CONFIG'
+    ))
+    default_include = pre_opts.get(
+        'default_include', opts['default_include']
+    )
+    include = pre_opts.get('include', [])
+    pre_opts.update(salt.config.include_config(
+        default_include, opts['conf_file'], verbose=False
+    ))
+    pre_opts.update(salt.config.include_config(
+        include, opts['conf_file'], verbose=True
+    ))
+    if 'grains' in pre_opts:
+        opts['grains'] = pre_opts['grains']
+    else:
+        opts['grains'] = {}
 
     load = _create_loader(opts, 'grains', 'grain', ext_dirs=False)
     grains = load.gen_grains()