[game-data-packager] 05/11: Expand optional groups before expanding install_contents_of

[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 cb0500355d2730eb8cb623796428398c6c733cc1
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Nov 3 08:40:23 2015 +0000

    Expand optional groups before expanding install_contents_of
    
    This fixes a minor regression in quake2 where some documentation files
    became mandatory.
---
 game_data_packager/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 50807e6..b1210a3 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -1020,14 +1020,14 @@ class GameData(object):
         self.loaded_file_data = True
 
         for package in self.packages.values():
+            package.install = set(self._iter_expand_groups(package.install))
+            package.optional = set(self._iter_expand_groups(package.optional))
+
             for provider in package.install_contents_of:
-                for filename in self.files[provider].provides:
+                for filename in self._iter_expand_groups(self.files[provider].provides):
                     if filename not in package.optional:
                         package.install.add(filename)
 
-            package.install = set(self._iter_expand_groups(package.install))
-            package.optional = set(self._iter_expand_groups(package.optional))
-
         for filename, f in self.files.items():
             f.provides = set(self._iter_expand_groups(f.provides))
 

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