[game-data-packager] 01/01: debian: consider backported/pre-release engines as the real thing

[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 0bd0036d3faace048f3cb1b15c0d8fca7d63774f
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Wed Feb 3 14:12:06 2016 +0100

    debian: consider backported/pre-release engines as the real thing
    
    I've "scummvm 1.8.0~git" in my own repos.
    
    fix handling of "gog: False" in toonstruck.yaml
---
 game_data_packager/build.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 873e0aa..59382a4 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -32,8 +32,10 @@ import zipfile
 import yaml
 try:
     from debian.debian_support import Version
+    BACKPORT_SUFFIX = '~'
 except ImportError:
     from distutils.version import LooseVersion as Version
+    BACKPORT_SUFFIX = ''
 
 from .data import (HashedFile)
 from .gog import GOG
@@ -1661,8 +1663,9 @@ class PackagingTask(object):
                 package.name)
 
         if engine and '>=' in engine:
-            dep['breaks'].add(engine.replace('>=', '<<'))
-            engine = engine.split()[0]
+            engine, ver = engine.split(maxsplit=1)
+            ver = ver.strip('(>=) ')
+            dep['breaks'].add('%s (<< %s~)' % (engine, ver))
 
         # We only 'recommends' & not 'depends'; to avoid
         # that GDP-generated packages get removed
@@ -1833,7 +1836,7 @@ class PackagingTask(object):
     def look_for_engine(self, engine):
         if '(' in engine:
             engine, ver = engine.split(maxsplit=1)
-            ver = ver.strip('(>=) ')
+            ver = ver.strip('(>=) ') + BACKPORT_SUFFIX
         else:
             ver = None
 
@@ -2427,6 +2430,8 @@ class PackagingTask(object):
 
         dirnames = set()
         for p in list(packages) + [self.game]:
+            if p.gog == False:
+                break
             # some games seem to list more than one installation path :-(
             path = p.gog.get('path')
             if isinstance(path, list):

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