[game-data-packager] 05/09: Accept $GDP_DEBUG as a synonym for $DEBUG

[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 c42be6ce5907138d15677693adf0dae9864f1a59
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 4 08:26:50 2016 +0000

    Accept $GDP_DEBUG as a synonym for $DEBUG
---
 game_data_packager/__init__.py | 6 ++++--
 game_data_packager/build.py    | 2 +-
 tools/check_syntax.py          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 82be35d..b543860 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -44,7 +44,7 @@ logger = logging.getLogger('game-data-packager')
 
 # For now, we're given these by the shell script wrapper.
 
-if os.environ.get('DEBUG'):
+if os.environ.get('DEBUG') or os.environ.get('GDP_DEBUG'):
     logging.getLogger().setLevel(logging.DEBUG)
 else:
     logging.getLogger().setLevel(logging.INFO)
@@ -562,7 +562,9 @@ class GameData(object):
             assert 'sha1sums' not in data, binary
             assert 'sha256sums' not in data, binary
 
-            if 'DISABLED' in data and not os.environ.get('DEBUG'):
+            if ('DISABLED' in data and
+                    not (os.environ.get('DEBUG') or
+                        os.environ.get('GDP_DEBUG'))):
                 continue
             package = self.construct_package(binary)
             self.packages[binary] = package
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index cd141ac..067511c 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1994,7 +1994,7 @@ class PackagingTask(object):
             # probably not enough files supplied?
             # print the help text, maybe that helps the user to determine
             # what they should have added
-            if not os.environ.get('DEBUG'):
+            if not os.environ.get('DEBUG') and not os.environ.get('GDP_DEBUG'):
                 self.game.argument_parser.print_help()
             raise SystemExit(1)
         except DownloadNotAllowed:
diff --git a/tools/check_syntax.py b/tools/check_syntax.py
index 397ae05..0148a24 100755
--- a/tools/check_syntax.py
+++ b/tools/check_syntax.py
@@ -26,6 +26,6 @@ if __name__ == '__main__':
         game.load_file_data()
         ascii_safe(game.longname, force=True).encode('ascii')
         ascii_safe(game.help_text, force=True).encode('ascii')
-        if 'DEBUG' in os.environ:
+        if 'DEBUG' in os.environ or 'GDP_DEBUG' in os.environ:
             print('# %s -----------------------------------------' % name)
             print(yaml.safe_dump(game.to_yaml()))

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