From: Gabriel Filion Date: Fri, 2 Aug 2013 20:31:03 +0000 (-0400) Subject: split-cmd.py: change -N to --noop (which actually exists) in error messages. X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c91bea60c7ffca26550e96435414b92307de8c35;p=packages%2Fb%2Fbup.git split-cmd.py: change -N to --noop (which actually exists) in error messages. Signed-off-by: Gabriel Filion Reviewed-by: Zoran Zaric [rlb@defaultvalue.org: adjusted commit message.] Reviewed-by: Rob Browning --- diff --git a/cmd/split-cmd.py b/cmd/split-cmd.py index de1cffe..443753f 100755 --- a/cmd/split-cmd.py +++ b/cmd/split-cmd.py @@ -35,10 +35,10 @@ handle_ctrl_c() git.check_repo_or_die() if not (opt.blobs or opt.tree or opt.commit or opt.name or opt.noop or opt.copy): - o.fatal("use one or more of -b, -t, -c, -n, -N, --copy") -if (opt.noop or opt.copy) and (opt.blobs or opt.tree or + o.fatal("use one or more of -b, -t, -c, -n, --noop, --copy") +if (opt.noop or opt.copy) and (opt.blobs or opt.tree or opt.commit or opt.name): - o.fatal('-N and --copy are incompatible with -b, -t, -c, -n') + o.fatal('--noop and --copy are incompatible with -b, -t, -c, -n') if opt.blobs and (opt.tree or opt.commit or opt.name): o.fatal('-b is incompatible with -t, -c, -n') if extra and opt.git_ids: