[game-data-packager] 05/14: Expand install_contents_of rather than including it in to_yaml

[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 8a083f0d980f82ea3c98d7acd2e6f9d0e5deb8a0
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Nov 1 17:03:38 2015 +0000

    Expand install_contents_of rather than including it in to_yaml
---
 game_data_packager/__init__.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 12f0c88..dd7a293 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -309,7 +309,6 @@ class GameDataPackage(object):
                 'dotemu',
                 'gog',
                 'install',
-                'install_contents_of',
                 'install_to_docdir',
                 'optional',
                 'origin',
@@ -897,6 +896,12 @@ class GameData(object):
 
         self.loaded_file_data = True
 
+        for package in self.packages.values():
+            for provider in package.install_contents_of:
+                for filename in self.files[provider].provides:
+                    if filename not in package.optional:
+                        package.install.add(filename)
+
         for filename, f in self.files.items():
             for provided in f.provides:
                 self.providers.setdefault(provided, set()).add(filename)
@@ -937,8 +942,8 @@ class GameData(object):
                 for filename in self.files[provider].provides:
                     assert filename in self.files, (package.name, provider,
                             filename)
-                    if filename not in package.optional:
-                        package.install.add(filename)
+                    assert (filename in package.optional or
+                            filename in package.install), (package.name, 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