[game-data-packager] 02/02: scummvm_common: default gameid to shortname

[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 65d0ad40a11ae931e81d427dcec2f85dfd4ed2c3
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sun Apr 26 15:30:48 2015 +0200

    scummvm_common: default gameid to shortname
---
 data/comi.yaml                             | 1 -
 data/dreamweb.yaml                         | 1 -
 data/sfinx.yaml                            | 1 -
 data/soltys.yaml                           | 1 -
 data/tentacle.yaml                         | 2 --
 game_data_packager/games/scummvm_common.py | 7 +++++--
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/data/comi.yaml b/data/comi.yaml
index b9fa642..240a5f8 100644
--- a/data/comi.yaml
+++ b/data/comi.yaml
@@ -5,7 +5,6 @@ copyright: © 1997 Lucasfilm Games
 # takes 1.5x time; xz is really slow
 compress_deb: [-Zgzip, -z1]
 plugin: scummvm_common
-gameid: comi
 help_text: |
   A demo can be downloaded here:
   http://download.cnet.com/The-Curse-of-Monkey-Island-demo/3000-2097_4-10010614.html
diff --git a/data/dreamweb.yaml b/data/dreamweb.yaml
index 6a28d69..3495262 100644
--- a/data/dreamweb.yaml
+++ b/data/dreamweb.yaml
@@ -1,7 +1,6 @@
 ---
 copyright: © 1994 Creative Reality
 plugin: scummvm_common
-gameid: dreamweb
 
 packages:
   dreamweb-us-data:
diff --git a/data/sfinx.yaml b/data/sfinx.yaml
index ef0c66d..02e40b2 100644
--- a/data/sfinx.yaml
+++ b/data/sfinx.yaml
@@ -1,7 +1,6 @@
 ---
 copyright: © 1997 L.K. Avalon
 plugin: scummvm_common
-gameid: sfinx
 
 help_text: |
   This requires a recent ScummVM build (December 22, 2014 or more recent),
diff --git a/data/soltys.yaml b/data/soltys.yaml
index 62f6632..310a7ec 100644
--- a/data/soltys.yaml
+++ b/data/soltys.yaml
@@ -2,7 +2,6 @@
 copyright: © 1995 L.K. Avalon
 longname: Sołtys
 plugin: scummvm_common
-gameid: soltys
 
 packages:
   soltys-en-data:
diff --git a/data/tentacle.yaml b/data/tentacle.yaml
index cb8a208..b97ea09 100644
--- a/data/tentacle.yaml
+++ b/data/tentacle.yaml
@@ -1,9 +1,7 @@
 ---
 longname: Day Of The Tentacle
 copyright: © 1993 LucasArts
-
 plugin: scummvm_common
-gameid: tentacle
 
 packages:
   dayofthetentacle-data:
diff --git a/game_data_packager/games/scummvm_common.py b/game_data_packager/games/scummvm_common.py
index bc9d079..dee2bb2 100644
--- a/game_data_packager/games/scummvm_common.py
+++ b/game_data_packager/games/scummvm_common.py
@@ -30,9 +30,12 @@ class ScummvmGameData(GameData):
         super(ScummvmGameData, self).__init__(shortname, data,
                 workdir=workdir)
 
-        self.gameid = self.data['gameid']
-        if self.gameid != shortname:
+        if 'gameid' in self.data:
+            self.gameid = self.data['gameid']
+            assert self.gameid != shortname, 'extraneous gameid for ' + shortname
             self.aliases.add(self.gameid)
+        else:
+            self.gameid = shortname
 
         if self.engine is None:
             self.engine = 'scummvm'

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