[game-data-packager] 01/01: make-template: check for innoextract version

[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 0a8497ca50d3143159beca183828b05dab633cab
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Aug 31 16:01:59 2015 +0200

    make-template: check for innoextract version
---
 game_data_packager/make_template.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/game_data_packager/make_template.py b/game_data_packager/make_template.py
index 9a1a4ad..bcb5662 100644
--- a/game_data_packager/make_template.py
+++ b/game_data_packager/make_template.py
@@ -206,7 +206,15 @@ class GameData(object):
 
     def add_one_innoextract(self,exe):
         tmp = tempfile.mkdtemp(prefix='gdptmp.')
-        log = subprocess.check_output(['innoextract', os.path.realpath(exe), '-I', 'app'],
+
+        command = ['innoextract', os.path.realpath(exe)]
+        version = subprocess.check_output(['innoextract', '-v', '-s'], universal_newlines=True)
+        if version[0:3] >= '1.5':
+            command.append('-I')
+            command.append('app')
+
+        logger.info('running "%s" ...' % ' '.join(command))
+        log = subprocess.check_output(command,
                  stderr=subprocess.DEVNULL,
                  universal_newlines=True,
                  cwd=tmp)

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