[game-data-packager] 01/01: doom2 masterlevels: accept "doom2-wad | freedoom" as depedency

[Alexandre Detiste]

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 9b918194e05a1a726104f9b8c5714c3810df21ca
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon May 11 20:29:06 2015 +0200

    doom2 masterlevels: accept "doom2-wad | freedoom" as depedency
---
 data/doom2.yaml                | 1 +
 game_data_packager/__init__.py | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/doom2.yaml b/data/doom2.yaml
index ce65e23..e88920a 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -48,6 +48,7 @@ packages:
       id: 9160
       path: "common/Master Levels of Doom"
     debian:
+      depends: doom2-wad | freedoom
       recommends: game-data-packager
     install_to: usr/share/games/doom
     symlinks:
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 3c0f3d5..b3c87c9 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -2045,7 +2045,12 @@ class GameData(object):
         breaks = read_control_set(package, control, 'Breaks')
 
         if package.expansion_for:
-            depends.add(package.expansion_for)
+            # check if default heuristic has been overriden in yaml
+            for p in depends:
+                if package.expansion_for == p.split()[0]:
+                    break
+            else:
+                depends.add(package.expansion_for)
         if package.engine:
             recommends.add(package.engine)
         elif not package.expansion_for and self.engine:

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