commit 668b2e363a25ae6d4a477c9c8072234508193e1e
author henryhsu <henryhsu@chromium.org> Thu Aug 01 10:23:32 2013
committer ChromeBot <chrome-bot@google.com> Tue Aug 13 11:10:30 2013
tree d4c9faef58570f01ec968f7a34373278595a66ab
parent 86e42e333ac87243b365fbb40b97ffc8ca6cd41a

CHERRY-PICK: Move some field to optional for storage probing

BUG=none
TEST=manually test

Change-Id: I0bf2c4e8834eb3f68ad6b9dfc8137ca332336755
Original: Change-Id: I4cd4319369aa86e7dfbe6a7ddcf8d9376eb91661
Original: Reviewed-on: https://gerrit.chromium.org/gerrit/64191
Original: Reviewed-by: Katie Roberts-Hoffman <katierh@chromium.org>
Original: Commit-Queue: Katie Roberts-Hoffman <katierh@chromium.org>
Original: Tested-by: Katie Roberts-Hoffman <katierh@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/64737
Reviewed-by: Heng-ruey Hsu <henryhsu@chromium.org>
Tested-by: Heng-ruey Hsu <henryhsu@chromium.org>
Commit-Queue: Heng-ruey Hsu <henryhsu@chromium.org>

py/gooftool/probe.py

diff --git a/py/gooftool/probe.py b/py/gooftool/probe.py
index e19f6c9..e708ea8 100644
--- a/py/gooftool/probe.py
+++ b/py/gooftool/probe.py
@@ -727,9 +727,10 @@
     sectors = (open(size_path).read().strip()
                if os.path.exists(size_path) else '')
     ata_fields = ['vendor', 'model']
-    emmc_fields = ['type', 'name', 'hwrev', 'oemid', 'cid', 'manfid', 'prv']
+    emmc_fields = ['type', 'name', 'hwrev', 'oemid', 'manfid']
+    optional_fields = ['cid', 'prv']
     data = (_ReadSysfsFields(dev_path, ata_fields) or
-            _ReadSysfsFields(dev_path, emmc_fields) or
+            _ReadSysfsFields(dev_path, emmc_fields, optional_fields) or
             None)
     if not data:
       return None