Merge changes from topic 'fsconfig2-fixups'

* changes:
  fsconfig: fix pylint warning
  fsconfig: fix style formating with yapf
diff --git a/tools/fs_config/fs_config_generator.py b/tools/fs_config/fs_config_generator.py
index 7f1ec3d..2cf2fd8 100755
--- a/tools/fs_config/fs_config_generator.py
+++ b/tools/fs_config/fs_config_generator.py
@@ -286,8 +286,10 @@
         """
 
         for lineno, line in enumerate(aid_file):
+
             def error_message(msg):
                 """Creates an error message with the current parsing state."""
+                # pylint: disable=cell-var-from-loop
                 return 'Error "{}" in file: "{}" on line: {}'.format(
                     msg, self._aid_header, str(lineno))
 
@@ -307,8 +309,9 @@
                             for x in AIDHeaderParser._AID_SKIP_RANGE):
                         self._handle_aid(identifier, value)
                 except ValueError as exception:
-                    sys.exit(error_message(
-                        '{} for "{}"'.format(exception, identifier)))
+                    sys.exit(
+                        error_message('{} for "{}"'.format(exception,
+                                                           identifier)))
 
     def _handle_aid(self, identifier, value):
         """Handle an AID C #define.