Fix semantic bugs in flashrom_util.py

client/common_lib/flashrom_util.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.
 
 """
 This module provides convenience routines to access Flash ROM (EEPROM).
  - flashrom_util is a low level wrapper of flashrom(8) program.
  - FlashromUtility is a high level object which provides more advanced
    features like journaling-alike (log-based) changing.
@@ skipping 686 matching lines @@
         if self.is_verbose:
             print " - reading current content"
         self.current_image = flashrom.read_whole()
         if not self.current_image:
             raise TestError("Cannot read flashrom image. Abort.")
         flashrom_size = len(self.current_image)
 
         if not use_fmap_layout:
             layout_image = None
         elif not layout_image:
-            layout_image = current_image
+            layout_image = self.current_image
 
         if layout_desc:
             layout = flashrom.detect_layout(
                     layout_desc, flashrom_size, layout_image)
         else:
             layout = flashrom.detect_chromeos_layout(
                     target, flashrom_size, layout_image)
         self.layout = layout
-        self.whole_flash_layout = flashrom.detect_layout('all', flashrom_size)
+        self.whole_flash_layout = flashrom.detect_layout('all', flashrom_size,
+                                                         None)
         if not skip_verify:
             skip_verify = DEFAULT_CHROMEOS_FIRMWARE_SKIP_VERIFY_LIST[target]
         self.skip_verify = skip_verify
         self.change_history = []  # reset list
 
     def get_current_image(self):
         """ Returns current flashrom image (physically, not changed) """
         return self.current_image
 
     def get_latest_changed_image(self):
@@ skipping 189 matching lines @@
 except ImportError:
     # print 'using mocks'
     utils = mock_utils()
     TestError = mock_TestError
 
 
 # main stub
 if __name__ == "__main__":
     # TODO(hungte) provide unit tests or command line usage
     pass