gooftool: fix EC/BIOS wpstatus in report

gft_report.py

 #!/usr/bin/env python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ gft_report.py: Device detail reports for factory process.
 
 The reports for factory is currently a python native dict.
 
 You can use CreateReport() to create a native report,
@@ skipping 187 matching lines @@
   report['rw_vpd'] = ParseVPDOutput(
       gft_common.SystemOutput("vpd -i RW_VPD -l %s" % vpd_cmd,
                               progress_messsage="Reading RW VPD",
                               show_progress=verbose).strip())
 
   # Probed hardware components
   report['probed_components'] = dict(
       [(key, ', '.join(value)) for key, value in probed_components.items()])
 
   # Firmware write protection status
-  wp_status_message = (
-      'main: %s\nec: %s' %
-      (gft_common.SystemOutput('flashrom -p internal:bus=lpc --wp-status'),
-       gft_common.SystemOutput('flashrom -p internal:bus=spi --wp-status')))
+  ec_wp_status = gft_common.SystemOutput(
+      'flashrom -p internal:bus=lpc --wp-status')
+  bios_wp_status = gft_common.SystemOutput(
+      'flashrom -p internal:bus=spi --wp-status')
+
+  wp_status_message = 'main: %s\nec: %s' % (bios_wp_status, ec_wp_status)
   report['wp_status'] = wp_status_message.splitlines()
 
   # TODO(hungte) we may also add these data in future:
   #   rootfs hash, dump_kernel_config, lsb-release from release image,
   #   gooftool version, result of dev_vboot_debug,
   #   /var/log/factory.log and any other customized data
 
   # Verbose log. Should be prepared before the last step.
   if verbose_log_path and os.path.exists(verbose_log_path):
     verbose_log = gft_common.ReadFile(verbose_log_path).splitlines()
@@ skipping 97 matching lines @@
   if options.report_path:
     print "Saved report to: %s" % options.report_path
     with open(options.report_path, "wb") as report_handle:
       report_handle.write(data)
   else:
     print data
 
 
 if __name__ == "__main__":
   main()