[game-data-packager] 03/05: Turn -f argument into something that actually works

[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 1682546e2cb90d488a8ec8288d20d6e307962f95
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 17 17:56:31 2015 +0000

    Turn -f argument into something that actually works
    
    Appending to parsed.paths is not actually useful, because the positional
    argument will overwrite parsed.paths anyway. However, we can be more or
    less compatible with existing behaviour by treating -f as --no-download.
---
 lib/game_data_packager/__init__.py       | 1 +
 lib/game_data_packager/games/lgeneral.py | 4 ++--
 lib/game_data_packager/games/rott.py     | 4 ++--
 lib/game_data_packager/games/tyrian.py   | 4 ++--
 lib/game_data_packager/games/wolf3d.py   | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index ec75ca1..63a25e2 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -1875,6 +1875,7 @@ def run_command_line():
             search=True,
     )
     parser.parse_args(namespace=parsed)
+    logger.debug('parsed command-line arguments into: %r', parsed)
 
     if parsed.destination is None and not parsed.install:
         logger.error('At least one of --install or --destination is required')
diff --git a/lib/game_data_packager/games/lgeneral.py b/lib/game_data_packager/games/lgeneral.py
index c76cb36..87bc74e 100644
--- a/lib/game_data_packager/games/lgeneral.py
+++ b/lib/game_data_packager/games/lgeneral.py
@@ -27,8 +27,8 @@ logger = logging.getLogger('game-data-packager.games.lgeneral')
 class LGeneralGameData(GameData):
     def add_parser(self, parsers, base_parser):
         parser = super(LGeneralGameData, self).add_parser(parsers, base_parser)
-        parser.add_argument('-f', action='append', dest='paths',
-                metavar='pg-data.tar.gz', help='Path to pg-data.tar.gz')
+        parser.add_argument('-f', dest='download', action='store_false',
+                help='Require pg-data.tar.gz on the command line')
         parser.add_argument('-w', dest='download', action='store_true',
                 help='Download pg-data.tar.gz (done automatically ' +
                     'if necessary)')
diff --git a/lib/game_data_packager/games/rott.py b/lib/game_data_packager/games/rott.py
index 63371fb..7fd23ea 100644
--- a/lib/game_data_packager/games/rott.py
+++ b/lib/game_data_packager/games/rott.py
@@ -24,8 +24,8 @@ logger = logging.getLogger('game-data-packager.games.rott')
 class ROTTGameData(GameData):
     def add_parser(self, parsers, base_parser):
         parser = super(ROTTGameData, self).add_parser(parsers, base_parser)
-        parser.add_argument('-f', action='append', dest='paths',
-                metavar='1rott13.zip', help='Path to 1rott13.zip')
+        parser.add_argument('-f', dest='download', action='store_false',
+                help='Require 1rott13.zip on the command line')
         parser.add_argument('-w', dest='download', action='store_true',
                 help='Download 1rott13.zip (done automatically if necessary)')
         return parser
diff --git a/lib/game_data_packager/games/tyrian.py b/lib/game_data_packager/games/tyrian.py
index 0db7cb6..3f6dd0c 100644
--- a/lib/game_data_packager/games/tyrian.py
+++ b/lib/game_data_packager/games/tyrian.py
@@ -24,8 +24,8 @@ logger = logging.getLogger('game-data-packager.games.tyrian')
 class TyrianGameData(GameData):
     def add_parser(self, parsers, base_parser):
         parser = super(TyrianGameData, self).add_parser(parsers, base_parser)
-        parser.add_argument('-f', action='append', dest='paths',
-                metavar='tyrian21.zip', help='Path to tyrian21.zip')
+        parser.add_argument('-f', dest='download', action='store_false',
+                help='Require tyrian21.zip on the command line')
         parser.add_argument('-w', dest='download', action='store_true',
                 help='Download tyrian21.zip (done automatically if necessary)')
         return parser
diff --git a/lib/game_data_packager/games/wolf3d.py b/lib/game_data_packager/games/wolf3d.py
index c6e5680..9f8e5fb 100644
--- a/lib/game_data_packager/games/wolf3d.py
+++ b/lib/game_data_packager/games/wolf3d.py
@@ -24,8 +24,8 @@ logger = logging.getLogger('game-data-packager.games.wolf3d')
 class Wolf3DGameData(GameData):
     def add_parser(self, parsers, base_parser):
         parser = super(Wolf3DGameData, self).add_parser(parsers, base_parser)
-        parser.add_argument('-f', action='append', dest='paths',
-                metavar='1wolf14.zip', help='Path to 1wolf14.zip')
+        parser.add_argument('-f', dest='download', action='store_false',
+                help='Require 1wolf14.zip on the command line')
         parser.add_argument('-w', dest='download', action='store_true',
                 help='Download 1wolf14.zip (done automatically if necessary)')
         return parser

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