From 840b9225517f09b2f72bddf52713dcd8c984f11a Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Thu, 18 Oct 2018 13:04:36 -0700
Subject: [PATCH] genconfig.py: only use CONFIG.local

Everything we need is in CONFIG.local - so just use that
file.  This allows us to remove the for loop as well.

CONFIG.local is currently a symlink to mk/config.mk - that
will be changed in the patch that removes the symlink.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ia7f84eac85d322f2873f089ab62c99a69c4d9ef9

Reviewed-on: https://review.gerrithub.io/429947
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: GangCao <gang.cao@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
---
 scripts/genconfig.py | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/scripts/genconfig.py b/scripts/genconfig.py
index f46096c58..131a3b30f 100755
--- a/scripts/genconfig.py
+++ b/scripts/genconfig.py
@@ -16,29 +16,28 @@ for arg in sys.argv:
         args[var] = val
 
 defs = {}
-for config in ('CONFIG', 'CONFIG.local'):
-    try:
-        with open(config) as f:
-            for line in f:
-                line = line.strip()
-                if not comment.match(line):
-                    m = assign.match(line)
-                    if m:
-                        var = m.group(1).strip()
-                        default = m.group(3).strip()
-                        val = default
-                        if var in args:
-                            val = args[var]
-                        if default.lower() == 'y' or default.lower() == 'n':
-                            if val.lower() == 'y':
-                                defs["SPDK_{0}".format(var)] = 1
-                            else:
-                                defs["SPDK_{0}".format(var)] = 0
+try:
+    with open("CONFIG.local") as f:
+        for line in f:
+            line = line.strip()
+            if not comment.match(line):
+                m = assign.match(line)
+                if m:
+                    var = m.group(1).strip()
+                    default = m.group(3).strip()
+                    val = default
+                    if var in args:
+                        val = args[var]
+                    if default.lower() == 'y' or default.lower() == 'n':
+                        if val.lower() == 'y':
+                            defs["SPDK_{0}".format(var)] = 1
                         else:
-                            strval = val.replace('"', '\"')
-                            defs["SPDK_{0}".format(var)] = strval
-    except IOError:
-        continue
+                            defs["SPDK_{0}".format(var)] = 0
+                    else:
+                        strval = val.replace('"', '\"')
+                        defs["SPDK_{0}".format(var)] = strval
+except IOError:
+    print("CONFIG.local not found")
 
 for key, value in sorted(defs.items()):
     if value == 0: