commit c5d6b50dce5286041ec9bf7496a4b71e247cbb45
author Mike Frysinger <vapier@chromium.org> Wed Jan 29 19:41:19 2014 -0500
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Jan 30 10:44:07 2014 +0000
tree 491e74d1889266ddbc5cc16c0b87e688c49f8155
parent 674d2d049198463ebc3f0e11fe4a20a1b42013f0

cgpt: add back format field

Previous commit here accidentally deleted the format field.

BUG=chromium:329112,chromium:339298
TEST=building for sonic doesn't warn anymore

Change-Id: If9fded31ac938d1ee1b9fcb8cd5457ff0bec82b4
Reviewed-on: https://chromium-review.googlesource.com/184302
Reviewed-by: Gaurav Shah <gauravsh@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

build_library/cgpt.py

diff --git a/build_library/cgpt.py b/build_library/cgpt.py
index 52bdc4e..f24f6b8 100755
--- a/build_library/cgpt.py
+++ b/build_library/cgpt.py
@@ -194,7 +194,7 @@
   valid_keys = set(('_comment', 'hybrid_mbr', 'metadata', 'layouts', 'parent'))
   valid_layout_keys = set((
       '_comment', 'num', 'blocks', 'block_size', 'fs_blocks', 'fs_block_size',
-      'uuid', 'label', 'fs_format', 'type', 'features', 'num'))
+      'uuid', 'label', 'format', 'fs_format', 'type', 'features', 'num'))
 
   config = _LoadStackedPartitionConfig(filename)