From bb7c1fe54844dcbb52574c31296e042c4eb46039 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 18 Aug 2014 21:20:02 +0200 Subject: pwclient: support signoff in the pwclientrc Try to obtain git-am '--signoff' settings from: - the commandline - the global option section - per-project section v2: handle NoOptionError Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Jeremy Kerr --- apps/patchwork/bin/pwclient | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient index a58e949..a7afafc 100755 --- a/apps/patchwork/bin/pwclient +++ b/apps/patchwork/bin/pwclient @@ -513,6 +513,8 @@ def main(): action_parser.print_help() sys.exit(1) + do_signoff = args.get('signoff') + # grab settings from config files config = ConfigParser.ConfigParser() config.read([CONFIG_FILE]) @@ -561,6 +563,10 @@ def main(): if not config.has_option(project_str, 'url'): sys.stderr.write("No URL for project %s\n" % project_str) sys.exit(1) + if not do_signoff and config.has_option('options', 'signoff'): + do_signoff = config.getboolean('options', 'signoff') + if not do_signoff and config.has_option(project_str, 'signoff'): + do_signoff = config.getboolean(project_str, 'signoff') url = config.get(project_str, 'url') @@ -632,7 +638,7 @@ def main(): elif action == 'git-am': cmd = ['git', 'am'] - if args.get('signoff'): + if do_signoff: cmd.append('-s') action_apply(rpc, patch_id, cmd) -- cgit v1.2.3