This is an automated email from the git hooks/post-receive script. detiste-guest pushed a commit to branch master in repository game-data-packager.
commit 29a58b9bf3646121d1cc8a10b7e745de5943dda5 Author: Alexandre Detiste <[email protected]> Date: Mon Mar 16 00:14:41 2015 +0100 accept alternatives as valid game engine providers --- game_data_packager/__init__.py | 7 +++++-- game_data_packager/util.py | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py index 7c1d0ac..28367da 100644 --- a/game_data_packager/__init__.py +++ b/game_data_packager/__init__.py @@ -2065,8 +2065,11 @@ class GameData(object): engine = package.engine or self.engine if not engine: continue - engine = engine.split('|')[0].split('(')[0].strip() - if not is_installed(engine): + for e in engine.split('|'): + if is_installed(e.split('(')[0].strip()): + break + else: + engine = engine.split('|')[0].split('(')[0].strip() engines.add(engine) if engines: print('it is recommended to also install this game engine: %s' % ', '.join(engines)) diff --git a/game_data_packager/util.py b/game_data_packager/util.py index a4d8a52..809c96b 100644 --- a/game_data_packager/util.py +++ b/game_data_packager/util.py @@ -77,4 +77,16 @@ def copy_with_substitutions(from_, to, **kwargs): to.write(line) def is_installed(package): + # FIXME: this shouldn't be hard-coded + if package == 'doom-engine': + return (is_installed('chocolate-doom') + or is_installed('prboom-plus') + or is_installed('doomsday')) + if package == 'boom-engine': + return (is_installed('prboom-plus') + or is_installed('doomsday')) + if package in ('heretic-engine', 'hexen-engine'): + return (is_installed('chocolate-doom') + or is_installed('doomsday')) + return os.path.isdir(os.path.join('/usr/share/doc', package)) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
