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

binman: Correct the error message for invalid path

Browse Source 
At present this message references -o for output file. But binman uses -f
now. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2019-07-20 12:24:14 -06:00
parent d7fa4e4b22
commit bb5edc1d3c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/binman/control.py
View File

@ -138,9 +138,9 @@ def ExtractEntries(image_fname, output_fname, outdir, entry_paths,
# Output an entry to a single file, as a special case # Output an entry to a single file, as a special case
if output_fname: if output_fname:
if not entry_paths: if not entry_paths:
raise ValueError('Must specify an entry path to write with -o') raise ValueError('Must specify an entry path to write with -f')
if len(entry_paths) != 1: if len(entry_paths) != 1:
raise ValueError('Must specify exactly one entry path to write with -o') raise ValueError('Must specify exactly one entry path to write with -f')
entry = image.FindEntryPath(entry_paths[0]) entry = image.FindEntryPath(entry_paths[0])
data = entry.ReadData(decomp) data = entry.ReadData(decomp)
tools.WriteFile(output_fname, data) tools.WriteFile(output_fname, data)

4
tools/binman/ftest.py
View File

@ -2683,7 +2683,7 @@ class TestFunctional(unittest.TestCase):
image_fname = tools.GetOutputFilename('image.bin') image_fname = tools.GetOutputFilename('image.bin')
with self.assertRaises(ValueError) as e: with self.assertRaises(ValueError) as e:
control.ExtractEntries(image_fname, 'fname', None, []) control.ExtractEntries(image_fname, 'fname', None, [])
self.assertIn('Must specify an entry path to write with -o', self.assertIn('Must specify an entry path to write with -f',
str(e.exception)) str(e.exception))
def testExtractTooManyEntryPaths(self): def testExtractTooManyEntryPaths(self):
@ -2693,7 +2693,7 @@ class TestFunctional(unittest.TestCase):
image_fname = tools.GetOutputFilename('image.bin') image_fname = tools.GetOutputFilename('image.bin')
with self.assertRaises(ValueError) as e: with self.assertRaises(ValueError) as e:
control.ExtractEntries(image_fname, 'fname', None, ['a', 'b']) control.ExtractEntries(image_fname, 'fname', None, ['a', 'b'])
self.assertIn('Must specify exactly one entry path to write with -o', self.assertIn('Must specify exactly one entry path to write with -f',
str(e.exception)) str(e.exception))
def testPackAlignSection(self): def testPackAlignSection(self):