client/common_lib/flashrom_util.py - Issue 3367006: Fix semantic bugs in flashrom_util.py

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/common_lib/flashrom_util.py

Issue 3367006: Fix semantic bugs in flashrom_util.py (Closed) Base URL: http://git.chromium.org/git/autotest.git

Patch Set: change back Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: client/common_lib/flashrom_util.py

diff --git a/client/common_lib/flashrom_util.py b/client/common_lib/flashrom_util.py

index 6b991696dbb90a7d22aaadac083aebf001c5d800..076072c67f420de47022b330c9131aeeb2b0e5d6 100644

--- a/client/common_lib/flashrom_util.py

+++ b/client/common_lib/flashrom_util.py

@@ -704,7 +704,7 @@ class FlashromUtility(object):

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(

@@ -713,7 +713,8 @@ class FlashromUtility(object):

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

« no previous file with comments | « no previous file | no next file » | no next file with comments »