[game-data-packager] 03/04: do not package a demo if we have any full game

[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 f0b6a22b5950991c7d59ce2fe411618b8f45a705
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Jul 13 01:26:35 2015 +0200

    do not package a demo if we have any full game
---
 game_data_packager/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 016aae0..919c89a 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -2645,14 +2645,15 @@ class GameData(object):
                      '"%s" is neither available nor already installed.',
                      package.name, package.expansion_for)
 
-            if not build_demos:
-                for demo_for in package.demo_for:
-                    if self.packages[demo_for] in possible:
-                        # no point in packaging the demo if we have the full
+            if not build_demos and package.demo_for:
+                for p in possible:
+                    if p.type == 'full':
+                        # no point in packaging a demo if we have any full
                         # version
-                        logger.debug('will not produce "%s" because we have '
-                            'the full version "%s"', package.name, demo_for)
+                        logger.info('will not produce "%s" because we have '
+                            'the full version "%s"', package.name, p.name)
                         abort = True
+                        break
             if abort:
                 continue
 

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