commit eede792c22d7ac2dcb97087b85778f69522e3ad2
author Ricky Liang <jcliang@chromium.org> Wed Jun 19 10:18:41 2013 +0800
committer ChromeBot <chrome-bot@google.com> Tue Jun 18 22:19:49 2013 -0700
tree 1a730e7589b0e6dfd55b44b10fa293d23de410f7
parent 676b529836a6a792480033c198f7ee9b5f7b06f9

Change default hwdb_path to platform/chromeos-hwid/v3, and get rid of
some arguments.

BUG=None
TEST=make lint test
TEST=Manually on my DUT.

Change-Id: I5fdaad55d41db2e925caa33c37f941d02c211498
Reviewed-on: https://gerrit.chromium.org/gerrit/59157
Reviewed-by: Jon Salz <jsalz@chromium.org>
Commit-Queue: Ricky Liang <jcliang@chromium.org>
Tested-by: Ricky Liang <jcliang@chromium.org>

py/gooftool/gooftool.py

diff --git a/py/gooftool/gooftool.py b/py/gooftool/gooftool.py
index 60694e3..d1d4fbc 100755
--- a/py/gooftool/gooftool.py
+++ b/py/gooftool/gooftool.py
@@ -38,6 +38,7 @@
 from cros.factory.hacked_argparse import CmdArg, Command, ParseCmdline
 from cros.factory.hacked_argparse import verbosity_cmd_arg
 from cros.factory.hwdb import hwid_tool
+from cros.factory.hwid import common
 from cros.factory.test.factory import FACTORY_LOG_PATH
 from cros.factory.utils.process_utils import Spawn
 from cros.factory.privacy import FilterDict
@@ -79,7 +80,7 @@
 
 _hwdb_path_cmd_arg = CmdArg(
     '--hwdb_path', metavar='PATH',
-    default=hwid_tool.DEFAULT_HWID_DATA_PATH,
+    default=common.DEFAULT_HWID_DATA_PATH,
     help='Path to the HWID database.')
 
 _hwid_status_list_cmd_arg = CmdArg(
@@ -906,6 +907,8 @@
   event_log.Log('vpd', probed_ro_vpd=FilterDict(probed_ro_vpd),
                  probed_rw_vpd=FilterDict(probed_rw_vpd))
 
+  if not options.board:
+    options.board = common.ProbeBoard(hwid_str)
   GetGooftool(options).VerifyHwidV3(
       hwid_str, probe_results, probed_ro_vpd, probed_rw_vpd)
 
@@ -951,6 +954,8 @@
   If no HWID is given, the HWID stored on the device will be loaded and used
   instead.
   """
+  if not options.board:
+    options.board = common.ProbeBoard(options.hwid)
   decoded_hwid_context = Gooftool(hwid_version=3, board=options.board,
                                   hwdb_path=options.hwdb_path).DecodeHwidV3(
                                       options.hwid)