[gnome-continuous-yocto/gnomeostree-3.28-rocko: 86/8267] scripts/lib/argparse_oe: simplify options title change

[Emmanuele Bassi <ebassi src gnome org>]

commit 09cbec8947a056e196209d177ac4c22c32699393
Author: Christopher Larson <chris_larson mentor com>
Date:   Wed Apr 27 16:24:00 2016 -0700

    scripts/lib/argparse_oe: simplify options title change
    
    There's no need to iterate over the action groups here, as self._optionals and
    self._positionals are available.
    
    (From OE-Core rev: 408694f4320f3cb52a391e5b927fb8c8ba16c1d2)
    
    Signed-off-by: Christopher Larson <chris_larson mentor com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/argparse_oe.py |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/scripts/lib/argparse_oe.py b/scripts/lib/argparse_oe.py
index 75002d0..2185a66 100644
--- a/scripts/lib/argparse_oe.py
+++ b/scripts/lib/argparse_oe.py
@@ -14,6 +14,7 @@ class ArgumentParser(argparse.ArgumentParser):
         kwargs.setdefault('formatter_class', OeHelpFormatter)
         self._subparser_groups = OrderedDict()
         super(ArgumentParser, self).__init__(*args, **kwargs)
+        self._optionals.title = 'options'
 
     def error(self, message):
         """error(message: string)
@@ -93,10 +94,6 @@ class ArgumentSubParser(ArgumentParser):
         if 'order' in kwargs:
             self._order = kwargs.pop('order')
         super(ArgumentSubParser, self).__init__(*args, **kwargs)
-        for agroup in self._action_groups:
-            if agroup.title == 'optional arguments':
-                agroup.title = 'options'
-                break
 
     def parse_known_args(self, args=None, namespace=None):
         # This works around argparse not handling optional positional arguments being