leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binman: Fix up ProcessUpdateContents error and comments

Browse Source 
This function raises an exception with its arguments around the wrong way
so the message is incorrect. Fix this as well as a few minor comment
problems.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-07-08 14:25:33 -06:00
parent e430440232
commit 5b463fc26e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/binman/entry.py
View File

@ -237,25 +237,25 @@ class Entry(object):
This sets both the data and content_size properties
Args:
data: Data to set to the contents (string)
data: Data to set to the contents (bytes)
"""
self.data = data
self.contents_size = len(self.data)
def ProcessContentsUpdate(self, data):
"""Update the contens of an entry, after the size is fixed
"""Update the contents of an entry, after the size is fixed
This checks that the new data is the same size as the old.
Args:
data: Data to set to the contents (string)
data: Data to set to the contents (bytes)
Raises:
ValueError if the new data size is not the same as the old
"""
if len(data) != self.contents_size:
self.Raise('Cannot update entry size from %d to %d' %
(len(data), self.contents_size))
(self.contents_size, len(data)))
self.SetContents(data)
def ObtainContents(self):

2
tools/binman/ftest.py
View File

@ -1223,7 +1223,7 @@ class TestFunctional(unittest.TestCase):
with self.assertRaises(ValueError) as e:
self._DoReadFile('059_change_size.dts', True)
self.assertIn("Node '/binman/_testing': Cannot update entry size from "
'2 to 1', str(e.exception))
'1 to 2', str(e.exception))
def testUpdateFdt(self):
"""Test that we can update the device tree with offset/size info"""