From: Brian Norris <computersforpeace@gmail.com>
Date: Fri, 16 Oct 2015 23:39:01 +0000 (-0700)
Subject: pwclient: require one or more of pwclient -{a,s}
X-Git-Tag: v1.0.0~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a466ebb4e7436849f7b627d93fb466b290f194f9;p=thirdparty%2Fpatchwork.git

pwclient: require one or more of pwclient -{a,s}

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 <computersforpeace@gmail.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Stephen Finucane <stephen.finucane@intel.com>
---

diff --git a/patchwork/bin/pwclient b/patchwork/bin/pwclient
index 236b237d..2193fd55 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,9 @@ def main():
             sys.exit(1)
         commit_str = args.get('c')
 
+    if state_str is None and archived_str is None and action == 'update':
+        update_parser.error('Must specify one or more update options (-a or -s)')
+
     if args.get('n') != None:
         try:
             filt.add("max_count", args.get('n'))