[game-data-packager] 03/03: innoextract: remove support for 'suffix' tag, use '?variation' instead

[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 5c15b87e70d93a6468e852224a1e641cbab9bf59
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Mon Oct 5 14:37:08 2015 +0200

    innoextract: remove support for 'suffix' tag, use '?variation' instead
---
 data/doom2.yaml             | 1 -
 doc/tags.txt                | 6 ++++--
 game_data_packager/build.py | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/data/doom2.yaml b/data/doom2.yaml
index 32359cc..a5da494 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -234,7 +234,6 @@ files:
   setup_doom2_2.0.0.6.exe:
     unpack:
       format: innoextract
-      suffix: _1.9
     provides:
     - doom2.wad?1.9
     - attack.wad
diff --git a/doc/tags.txt b/doc/tags.txt
index b7c1b8e..aa4df5b 100644
--- a/doc/tags.txt
+++ b/doc/tags.txt
@@ -16,10 +16,13 @@ missing_langs: list
 
 help_text: string
 disabled_help_text: string
+wikibase: string (url)
+wiki: string
 
 packages:
  <package>:
     longname: string
+    wiki: string
     aliases: list
     engine: string
     demo_for: list
@@ -82,8 +85,7 @@ files:
       flags: list (7z)
       groups: list (unshield)
       prefix: string (innoextract)
-      suffix: string (innoextract)
-      other_parts: list (cat, unshield, arj)
+      other_parts: list (cat, unshield, arj, innoextract)
       unpack: list
     provides: list
 
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 1080523..86d56b3 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1116,7 +1116,6 @@ class PackagingTask(object):
                                                           universal_newlines=True)
                         if Version(version.split('-')[0]) >= Version('1.5'):
                             prefix = provider.unpack.get('prefix', '')
-                            suffix = provider.unpack.get('suffix', '')
                             if prefix and not prefix.endswith('/'):
                                 prefix += '/'
                             if '$provides' in to_unpack:
@@ -1126,8 +1125,6 @@ class PackagingTask(object):
                                 cmdline.append('-I')
                                 if prefix and i[0] != '/':
                                     i = prefix + i
-                                if suffix and i.endswith(suffix):
-                                    i = i[:len(i)-len(suffix)]
                                 if 'unpack' not in provider.unpack:
                                     i = i.split('?')[0]
                                 cmdline.append(i)

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