[game-data-packager] 46/51: make_template: Don't add empty groups

[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 20b0d07fbd2c43ded886627f33aaac9ccdccc63c
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Dec 28 22:53:39 2017 +0000

    make_template: Don't add empty groups
    
    Signed-off-by: Simon McVittie <smcv at debian.org>
---
 game_data_packager/make_template.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/game_data_packager/make_template.py b/game_data_packager/make_template.py
index c290560..03678ba 100644
--- a/game_data_packager/make_template.py
+++ b/game_data_packager/make_template.py
@@ -275,10 +275,6 @@ class Template:
             abs_group.install_to = '.'
             optional.add(abs_group.name)
 
-            for g in (
-                    main_group, opt_group, doc_group, license_group, abs_group):
-                groups_found[g.name] = g
-
             for n in remaining:
                 f = self.game.files[n]
 
@@ -296,6 +292,11 @@ class Template:
                 else:
                     main_group.group_members.add(n)
 
+            for g in (
+                    main_group, opt_group, doc_group, license_group, abs_group):
+                if g.group_members:
+                    groups_found[g.name] = g
+
         if provider:
             provider.provides = set()
 
@@ -305,10 +306,11 @@ class Template:
 
         if package:
             for name, g in groups_found.items():
-                if g.license or g.doc or g.ignorable or name in optional:
-                    package.optional.add(name)
-                else:
-                    package.install.add(name)
+                if g.group_members:
+                    if g.license or g.doc or g.ignorable or name in optional:
+                        package.optional.add(name)
+                    else:
+                        package.install.add(name)
 
     def add_file(self, path, out_name=None, opened=None, size=None,
             lang=None, parent_unpacker=None, unpack=False):

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