commit a5c01a0d6dee31948f1bac2e11ec3fa285a692e0
author Wei-Han Chen <stimim@google.com> Sat Apr 23 19:27:19 2016 +0800
committer chrome-bot <chrome-bot@chromium.org> Thu May 19 04:30:20 2016 -0700
tree c1a3b434dc547de2ac0f76bee66d1ad698746459
parent 97baa50da09cc2d9356f996d7b6fefa370382f15

gooftool: log hash of factory PAR if running PAR

LogSourceHashes tries to compute hash value of each python source code.
However, when python is running using PAR (python archive), we only need to
compute hash value of entire PAR file.

TEST=manual test
BUG=None

Change-Id: Ic4f85a5379479a6de686235a2d03b44815bbae2c
Reviewed-on: https://chromium-review.googlesource.com/340483
Commit-Ready: Wei-Han Chen <stimim@chromium.org>
Tested-by: Wei-Han Chen <stimim@chromium.org>
Reviewed-by: Chih-Yu Huang <akahuang@chromium.org>

py/gooftool/commands.py

diff --git a/py/gooftool/commands.py b/py/gooftool/commands.py
index a51e870..3344dfa 100755
--- a/py/gooftool/commands.py
+++ b/py/gooftool/commands.py
@@ -48,6 +48,7 @@
 from cros.factory.test.rules import phase
 from cros.factory.test.rules.privacy import FilterDict
 from cros.factory.utils import file_utils
+from cros.factory.utils import sys_utils
 from cros.factory.utils.debug_utils import SetupLogging
 from cros.factory.utils.process_utils import Spawn
 from cros.factory.utils.type_utils import Error
@@ -797,9 +798,15 @@
   # of the factory software.  Do not remove or modify it.
   #
   # 警告：此行会验证工厂软件的完整性，禁止删除或修改。
-  event_log.Log(
-      'source_hashes',
-      **file_utils.HashSourceTree(os.path.join(paths.FACTORY_PATH, 'py')))
+  factory_par = sys_utils.GetRunningFactoryPythonArchivePath()
+  if factory_par:
+    event_log.Log(
+        'source_hashes',
+        **file_utils.HashPythonArchive(factory_par))
+  else:
+    event_log.Log(
+        'source_hashes',
+        **file_utils.HashSourceTree(os.path.join(paths.FACTORY_PATH, 'py')))
 
 
 @Command('log_system_details')