[game-data-packager] 01/02: handle contrib packages too: e.g. dfsg mod for non-free game

[Alexandre Detiste]

This is an automated email from the git hooks/post-receive script.

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit 7d123d32eb47d4c50b8f79a76d4262e3688f9d0a
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Apr 25 22:47:53 2015 +0200

    handle contrib packages too: e.g. dfsg mod for non-free game
---
 game_data_packager/__init__.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index ea071db..bbdfb8a 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -776,7 +776,7 @@ class GameData(object):
                 setattr(package, k, d[k])
 
         assert self.copyright or package.copyright, package.name
-        assert package.section in ('non-free/games', 'games'), 'unsupported'
+        assert package.section in ('non-free/games', 'contrib/games', 'games'), 'unsupported'
 
         if 'install_to' in d:
             assert 'usr/share/games/' + package.name != d['install_to'] + '-data', \
@@ -2545,15 +2545,13 @@ class GameData(object):
         # optional license file is present
         if package.section.split('/')[0] == 'non-free':
             return
-        license_missing = False
         for f in package.optional:
              if not self.files[f].license:
                  continue
              if self.file_status[f] is not FillResult.COMPLETE:
-                 license_missing = True
-                 break
-        if license_missing:
-            package.section = 'non-free/' + package.section
+                 package.section = 'non-free/' + package.section.split('/')[-1]
+                 return
+        return
 
     def build_deb(self, package, destination, compress=True):
         """

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