summaryrefslogtreecommitdiff
path: root/tools/patman/patman.py
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-03-26 13:09:42 (GMT)
committerSimon Glass <sjg@chromium.org>2013-04-08 22:09:03 (GMT)
commita1318f7cdc2fcff3b30d39750dd07dbed8f03f21 (patch)
tree675907d3a287ebbb8e604bb4ecfd4b4a4b9bf5cd /tools/patman/patman.py
parentf140b5863b258120f5412ea86733f70c87837ee9 (diff)
downloadu-boot-fsl-qoriq-a1318f7cdc2fcff3b30d39750dd07dbed8f03f21.tar.xz
patman: Provide option to ignore bad aliases
Often it happens that patches include tags which don't have aliases. It is annoying that patman fails in this case, and provides no option to continue other than adding empty tags to the .patman file. Correct this by adding a '-t' option to ignore tags that don't exist. Print a warning instead. Since running the tests is not a common operation, move this to --test instead, to reserve -t for this new option. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Doug Anderson <dianders@chromium.org>
Diffstat (limited to 'tools/patman/patman.py')
-rwxr-xr-xtools/patman/patman.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index 5000b7d..23026be 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -57,7 +57,9 @@ parser.add_option('-r', '--in-reply-to', type='string', action='store',
help="Message ID that this series is in reply to")
parser.add_option('-s', '--start', dest='start', type='int',
default=0, help='Commit to start creating patches from (0 = HEAD)')
-parser.add_option('-t', '--test', action='store_true', dest='test',
+parser.add_option('-t', '--ignore-bad-tags', action='store_true',
+ default=False, help='Ignore bad tags / aliases')
+parser.add_option('--test', action='store_true', dest='test',
default=False, help='run tests')
parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
default=False, help='Verbose output of errors and warnings')
@@ -159,13 +161,15 @@ else:
options.count + options.start):
ok = False
- cc_file = series.MakeCcFile(options.process_tags, cover_fname)
+ cc_file = series.MakeCcFile(options.process_tags, cover_fname,
+ not options.ignore_bad_tags)
# Email the patches out (giving the user time to check / cancel)
cmd = ''
if ok or options.ignore_errors:
cmd = gitutil.EmailPatches(series, cover_fname, args,
- options.dry_run, cc_file, in_reply_to=options.in_reply_to)
+ options.dry_run, not options.ignore_bad_tags, cc_file,
+ in_reply_to=options.in_reply_to)
# For a dry run, just show our actions as a sanity check
if options.dry_run: