[game-data-packager] 01/01: prepare_packages(): tweak package slection algorithm

[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 3206048005ba3e1783f5666a4c0e41a7bee838b6
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Oct 19 14:59:52 2015 +0200

    prepare_packages(): tweak package slection algorithm
---
 game_data_packager/build.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 56002a6..d86b8b9 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -2070,6 +2070,17 @@ class PackagingTask(object):
         if not possible:
             raise NoPackagesPossible()
 
+        # this check is done before the language check to avoid to end up with
+        # simon-the-sorcerer1-fr-data + simon-the-sorcerer1-dos-en-data
+        for package in set(possible):
+            if (package.better_version
+                and self.game.packages[package.better_version] in possible):
+                  logger.info('will not produce "%s" because better version '
+                     '"%s" is also available',
+                     package.name,
+                     package.better_version)
+                  possible.discard(package)
+
         for package in set(possible):
             score = max(set(lang_score(l) for l in package.langs))
             if score == 0:
@@ -2097,15 +2108,6 @@ class PackagingTask(object):
             raise NoPackagesPossible()
 
         for package in set(possible):
-            if (package.better_version
-                and self.game.packages[package.better_version] in possible):
-                  logger.info('will not produce "%s" because better version '
-                     '"%s" is also available',
-                     package.name,
-                     package.better_version)
-                  possible.discard(package)
-                  continue
-
             if (package.expansion_for
               and self.game.packages[package.expansion_for] not in possible
               and not PACKAGE_CACHE.is_installed(package.expansion_for)):

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