[game-data-packager] 07/21: When files in install_contents_of are already optional, don't make them mandatory

[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 b46a0ecb69c075218a8b3110cc860db0a1a5cfed
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jan 21 22:59:04 2015 +0000

    When files in install_contents_of are already optional, don't make them mandatory
---
 lib/game_data_packager/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index fe5ee03..2814b44 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -597,7 +597,8 @@ class GameData(object):
                 for filename in self.files[provider].provides:
                     assert filename in self.files, (package.name, provider,
                             filename)
-                    package.install.add(filename)
+                    if filename not in package.optional:
+                        package.install.add(filename)
 
             if package.rip_cd:
                 # we only support Ogg Vorbis for now

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