[game-data-packager] 01/01: innoextract: check version of custom builds

[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 b818b6a690fb35a230540bf11d9ed5eadd3a7131
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Tue Sep 1 09:33:21 2015 +0200

    innoextract: check version of custom builds
---
 data/descent2.yaml             | 1 -
 data/theme-hospital.yaml       | 5 -----
 game_data_packager/__init__.py | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/data/descent2.yaml b/data/descent2.yaml
index a8892fa..10d2292 100644
--- a/data/descent2.yaml
+++ b/data/descent2.yaml
@@ -82,7 +82,6 @@ files:
   setup_descent_1_2.exe:
     unpack:
       format: innoextract
-      unpack: [FIXME]
     provides:
     - alien1.pig
     - alien2.pig
diff --git a/data/theme-hospital.yaml b/data/theme-hospital.yaml
index 843684a..5be7217 100644
--- a/data/theme-hospital.yaml
+++ b/data/theme-hospital.yaml
@@ -1904,7 +1904,6 @@ files:
   setup_theme_hospital_2.0.0.5.exe:
     unpack:
       format: innoextract
-      unpack: [FIXME]
     provides:
     - anims/320x2401.smk
     - anims/320x2402.smk
@@ -2306,7 +2305,6 @@ files:
     - sound/data/sound-4.dat
     - sound/data/sound-5.dat
     - sound/dig.ini
-    - sound/dos4gw.exe
     - sound/esfm.mdi
     - sound/iwav.dig
     - sound/iwav.mdi
@@ -2319,14 +2317,12 @@ files:
     - sound/midi/hospmidi.bat
     - sound/midi/mend.xmi
     - sound/midi/midi.txt
-    - sound/midi/midiform.exe
     - sound/midi/nightsh.xmi
     - sound/midi/readme.txt
     - sound/midi/sixseven.xmi
     - sound/midi/steady.xmi
     - sound/mpu401.mdi
     - sound/mssdrvr.lst
-    - sound/mssw95.exe
     - sound/nvdig.dig
     - sound/nvmpu.mdi
     - sound/opl3.mdi
@@ -2343,7 +2339,6 @@ files:
     - sound/sbpro.dig
     - sound/sbpro1.mdi
     - sound/sbpro2.mdi
-    - sound/setsound.exe
     - sound/sndscape.dig
     - sound/sndscape.mdi
     - sound/sndsys.dig
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 7294eff..3e8de61 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -1750,7 +1750,7 @@ class GameData(object):
                         cmdline.append('--silent')
                     version = subprocess.check_output(['innoextract', '-v', '-s'],
                                                       universal_newlines=True)
-                    if version != '1.4' and 'FIXME' not in to_unpack:
+                    if version[0:3] >= '1.5':
                         prefix = provider.unpack.get('prefix', '')
                         suffix = provider.unpack.get('suffix', '')
                         if prefix and not prefix.endswith('/'):

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