[game-data-packager] 04/09: Do not try to obtain non-preferred alternatives for files

[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 6cbdeaf82a1f44694471b6c0381e65d3a7f4cb82
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 4 06:36:12 2016 +0000

    Do not try to obtain non-preferred alternatives for files
    
    If we had
    
    file.ext:
      alternatives: [file.ext?gog, file.ext?patch]
    patch.zip:
      download: ...
      provides: [file.ext?patch]
      unpack: ...
    
    and we found the GOG version of file, we'd incorrectly still download
    patch.zip. Now we don't.
    
    In particular, this situation happened in the work-in-progress
    packaging for Unreal 1.
---
 game_data_packager/build.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 1e8176f..cd141ac 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -853,6 +853,10 @@ class PackagingTask(object):
                 self.file_status[wanted.name] |= self.fill_gap(package,
                   self.game.files[alt], download=download, log=False,
                   recheck=recheck)
+                if alt in self.found:
+                    assert self.file_status[alt] is FillResult.COMPLETE
+                    assert self.file_status[wanted.name] is FillResult.COMPLETE
+                    return FillResult.COMPLETE
 
             if self.file_status[wanted.name] is FillResult.IMPOSSIBLE and log:
                 logger.error('could not find a suitable version of %s:',

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