[game-data-packager] 01/01: make-template: don't crash when unable to guess $install_to

[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 094bbc24b82a4bb43ab707f46e6e7999d0d8207b
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Oct 30 22:22:08 2016 +0000

    make-template: don't crash when unable to guess $install_to
    
    Regression in 0b022b5b, v46.
    
    Bug-Debian: #841164
---
 debian/changelog                    | 8 ++++++++
 game_data_packager/make_template.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c73e8f0..477b8cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+game-data-packager (47) UNRELEASED; urgency=medium
+
+  * Enhancements and bug fixes:
+    - make-template: don't crash when unable to guess what $install_to
+      should have been. Regression in v46. (Closes: #841164)
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 30 Oct 2016 22:19:21 +0000
+
 game-data-packager (46) experimental; urgency=medium
 
   * Support for new languages and versions:
diff --git a/game_data_packager/make_template.py b/game_data_packager/make_template.py
index 86a56d1..b480400 100644
--- a/game_data_packager/make_template.py
+++ b/game_data_packager/make_template.py
@@ -551,7 +551,7 @@ class GameData(object):
                         logger.warning('unhandled data.tar entry type: %s: %s',
                             name, entry.type)
 
-        if self.plugin != 'scummvm_common':
+        if self.plugin != 'scummvm_common' and install_to is not None:
             self.package['install_to'] = os.path.join('/',
                     install_to).replace('/usr/share/games/', '$assets/')
         self.package['install'].sort()

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