[game-data-packager] 15/25: make-check: add an assertion to catch extraneous 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 adf65caf3068ecf31078fcfb99a8337c8e85aee2
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Feb 9 20:24:13 2015 +0100

    make-check: add an assertion to catch extraneous install_to:
---
 data/hexen2.yaml               | 1 -
 data/quake2.yaml               | 1 -
 game_data_packager/__init__.py | 4 ++++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/hexen2.yaml b/data/hexen2.yaml
index 62511f5..4ce469f 100644
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@ -38,7 +38,6 @@ packages:
     steam:
       id: 9060
       path: "common/Hexen 2"
-    install_to: usr/share/games/hexen2
     install_files_from_cksums: |
       2912412704 22704056 data1/pak0.pak
       4210700438 75601170 data1/pak1.pak
diff --git a/data/quake2.yaml b/data/quake2.yaml
index 1404db0..f8da268 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -205,7 +205,6 @@ packages:
     demo_for: quake2-full-data
     debian:
       engine: quake2 | quake2-server
-    install_to: usr/share/games/quake2-demo
     install_to_docdir:
       - quake2_manual
     install_contents_of:
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index bba1c17..622f13d 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -730,6 +730,10 @@ class GameData(object):
             if k in d:
                 setattr(package, k, d[k])
 
+        if 'install_to' in d:
+            assert 'usr/share/games/' + package.name != d['install_to'] + '-data', \
+                "install_to %s is extraneous" % package.name
+
         if 'demo_for' in d:
             if type(d['demo_for']) is str:
                 package.demo_for.add(d['demo_for'])

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