On 16 Oct 2015 16:12, Brian Norris wrote:
> Previously, we required the -s flag for 'pwclient update'. But since we
> allow updating up to 2 different fields ('archived' and 'state'), drop
> the required flag, and just enforce that the user must provide -a, -s,
> or both.
>
> Signed-off-by: Brian Norris <[email protected]>
> ---
> patchwork/bin/pwclient | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/patchwork/bin/pwclient b/patchwork/bin/pwclient
> index 236b237ddeb3..596a26d8aa9d 100755
> --- a/patchwork/bin/pwclient
> +++ b/patchwork/bin/pwclient
> @@ -507,7 +507,6 @@ def main():
> )
> update_parser.add_argument(
> '-s', metavar='STATE',
> - required=True,
> help='''Set patch state (e.g., 'Accepted', 'Superseded' etc.)'''
> )
> update_parser.add_argument(
> @@ -572,6 +571,11 @@ def main():
> sys.exit(1)
> commit_str = args.get('c')
>
> + if state_str == None and archived_str == None and action == 'update':
use "is None" instead of "== None"
> + sys.stderr.write("Must specify one or more update options (-a or
> -s)\n")
> + update_parser.print_help()
> + sys.exit(1)
better to use:
update_parser.error('Must specify one or more update options (-a or
-s)')
probably should convert all the other users that do this too
-mike
signature.asc
Description: Digital signature
_______________________________________________ Patchwork mailing list [email protected] https://lists.ozlabs.org/listinfo/patchwork
