commit ce6c8e629f393de7dadccb058a40e1da357e87c9
author Elliott Hughes <enh@google.com> Wed Jan 04 00:37:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 04 00:37:58 2017 +0000
tree 11ed964b7a837ca509adbc07c4ecb24e4460eb49
parent 7cfc591596a99dcb6ed0b18918edf5149fd525cf
parent 1552a28e5f8d437aabeb97f167d80c07e1af987c

Merge "fs_config: Fix oem range parsing"

tools/fs_config/fs_config_generator.py

diff --git a/tools/fs_config/fs_config_generator.py b/tools/fs_config/fs_config_generator.py
index 6b5e03c..7f1ec3d 100755
--- a/tools/fs_config/fs_config_generator.py
+++ b/tools/fs_config/fs_config_generator.py
@@ -252,7 +252,7 @@
     _AID_DEFINE = re.compile(r'\s*#define\s+%s.*' % AID.PREFIX)
     _OEM_START_KW = 'START'
     _OEM_END_KW = 'END'
-    _OEM_RANGE = re.compile('%s_OEM_RESERVED_[0-9]*_{0,1}(%s|%s)' %
+    _OEM_RANGE = re.compile('%sOEM_RESERVED_[0-9]*_{0,1}(%s|%s)' %
                             (AID.PREFIX, _OEM_START_KW, _OEM_END_KW))
     # AID lines cannot end with _START or _END, ie AID_FOO is OK
     # but AID_FOO_START is skiped. Note that AID_FOOSTART is NOT skipped.