diff options
| author | Simon Glass <sjg@chromium.org> | 2019-07-20 12:24:14 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-07-29 09:38:06 -0600 |
| commit | bb5edc1d3c0ebc989dfaa7d1e57cdde15d61f2e0 (patch) | |
| tree | 53e70b84636a40bdc99206e05509c9386d11b239 /tools/binman | |
| parent | d7fa4e4b22d8f493e6f643843f0a7aaf448d098a (diff) | |
| download | u-boot-bb5edc1d3c0ebc989dfaa7d1e57cdde15d61f2e0.tar.gz u-boot-bb5edc1d3c0ebc989dfaa7d1e57cdde15d61f2e0.tar.xz u-boot-bb5edc1d3c0ebc989dfaa7d1e57cdde15d61f2e0.zip | |
binman: Correct the error message for invalid path
At present this message references -o for output file. But binman uses -f
now. Fix it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/binman')
| -rw-r--r-- | tools/binman/control.py | 4 | ||||
| -rw-r--r-- | tools/binman/ftest.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/binman/control.py b/tools/binman/control.py index 232a38d984..e6722c9459 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -138,9 +138,9 @@ def ExtractEntries(image_fname, output_fname, outdir, entry_paths, # Output an entry to a single file, as a special case if output_fname: 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: - 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]) data = entry.ReadData(decomp) tools.WriteFile(output_fname, data) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index c0842c4386..358f095dfb 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -2683,7 +2683,7 @@ class TestFunctional(unittest.TestCase): image_fname = tools.GetOutputFilename('image.bin') with self.assertRaises(ValueError) as e: 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)) def testExtractTooManyEntryPaths(self): @@ -2693,7 +2693,7 @@ class TestFunctional(unittest.TestCase): image_fname = tools.GetOutputFilename('image.bin') with self.assertRaises(ValueError) as e: 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)) def testPackAlignSection(self): |