[game-data-packager] 05/10: fix: package.longname is not 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 e6f247430e1f57aa8474702346a83d86f8999f4d
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Jan 17 23:56:26 2015 +0100

    fix: package.longname is not mandatory
---
 lib/game_data_packager/__init__.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index 1588269..28b9a11 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -1569,15 +1569,20 @@ class GameData(object):
         control['Version'] = package.version
 
         if 'Description' not in control:
+            if package.longname:
+                longname = package.longname
+            else:
+                longname = self.longname
+
             long_desc =  ' This package was built using game-data-packager. It contains\n'
             long_desc += ' proprietary game data and must not be redistributed.\n'
             long_desc += ' .\n'
-            long_desc += ' Game: ' + package.longname
+            long_desc += ' Game: ' + longname
             if engine:
                 long_desc += '\n .\n'
                 long_desc += ' Intended for use with: ' + engine
 
-            control['Description'] = 'data for ' + package.longname + '\n' + long_desc
+            control['Description'] = 'data for ' + longname + '\n' + long_desc
 
     def get_control_template(self, package):
         return os.path.join(DATADIR, package.name + '.control.in')

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