[game-data-packager] 01/02: Promote --search, --no-search to be global options

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit 745292a9262dd8ff19298d486788b6a39043d4da
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Dec 22 16:44:50 2016 +0000

    Promote --search, --no-search to be global options
    
    This makes them show up in "g-d-p --help", not just in
    "g-d-p some-game --help".
---
 debian/changelog                   | 8 ++++++++
 game_data_packager/__init__.py     | 8 --------
 game_data_packager/command_line.py | 8 ++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4374680..7b53972 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+game-data-packager (49) UNRELEASED; urgency=medium
+
+  * Enhancements and bug fixes:
+    - Promote --search and --no-search from per-game options to
+      global options so they show in global --help (Closes: #848374) [smcv]
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 22 Dec 2016 16:43:05 +0000
+
 game-data-packager (48) unstable; urgency=medium
 
   * Enhancements and bug fixes:
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 7f7171a..78dfd31 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -515,14 +515,6 @@ class GameData(object):
                 parents=(base_parser,),
                 **kwargs)
 
-        group = parser.add_mutually_exclusive_group()
-        group.add_argument('--search', action='store_true', default=True,
-            help='look for installed files in Steam and other likely places ' +
-                '(default)')
-        group.add_argument('--no-search', action='store_false',
-            dest='search',
-            help='only look in paths provided on the command line')
-
         parser.add_argument('paths', nargs='*',
                 metavar='DIRECTORY|FILE',
                 help='Files to use in constructing the .deb')
diff --git a/game_data_packager/command_line.py b/game_data_packager/command_line.py
index 083b4ff..1309aa7 100644
--- a/game_data_packager/command_line.py
+++ b/game_data_packager/command_line.py
@@ -145,6 +145,14 @@ def run_command_line():
             help='save downloaded files to DIR, and look for files there')
 
     group = base_parser.add_mutually_exclusive_group()
+    group.add_argument('--search', action='store_true', default=True,
+        help='look for installed files in Steam and other likely places ' +
+            '(default)')
+    group.add_argument('--no-search', action='store_false',
+        dest='search',
+        help='only look in paths provided on the command line')
+
+    group = base_parser.add_mutually_exclusive_group()
     group.add_argument('--verbose', action='store_true',
             help='show output from external tools')
     group.add_argument('--no-verbose', action='store_false',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git