[game-data-packager] 01/01: modify_template: sort code

[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 88020f718a5e1952195e731f569d0537bc292a29
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Nov 7 10:03:24 2015 +0100

    modify_template: sort code
---
 game_data_packager/build.py | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 099cb18..48dbeea 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1617,6 +1617,8 @@ class PackagingTask(object):
             assert key == 'Description', 'specify "%s" only in YAML' % key
         control['Package'] = package.name
         control['Version'] = package.version
+        control['Priority'] = 'optional'
+        control['Maintainer'] = 'Debian Games Team <pkg-games-devel at lists.alioth.debian.org>'
 
         installed_size = 0
         # algorithm from https://bugs.debian.org/650077 designed to be
@@ -1638,9 +1640,6 @@ class PackagingTask(object):
                     installed_size += 1
         control['Installed-Size'] = str(installed_size)
 
-        control['Priority'] = 'optional'
-        control['Maintainer'] = 'Debian Games Team <pkg-games-devel at lists.alioth.debian.org>'
-
         if package.component == 'main':
             control['Section'] = package.section
         else:
@@ -1665,13 +1664,16 @@ class PackagingTask(object):
         if package.provides:
             dep['provides'].add(package.provides)
             if package.mutually_exclusive:
-                dep['conflicts'].add(package.provides)
                 dep['replaces'].add(package.provides)
 
         engine = package.engine or self.game.engine
         if engine and '>=' in engine:
             dep['breaks'].add(engine.replace('>=', '<<'))
             engine = engine.split()[0]
+        if package.engine:
+            dep['recommends'].add(engine)
+        elif not package.expansion_for and self.game.engine:
+            dep['recommends'].add(engine)
 
         if package.expansion_for:
             # check if default heuristic has been overriden in yaml
@@ -1681,11 +1683,6 @@ class PackagingTask(object):
             else:
                 dep['depends'].add(package.expansion_for)
 
-        if package.engine:
-            dep['recommends'].add(engine)
-        elif not package.expansion_for and self.game.engine:
-            dep['recommends'].add(engine)
-
         # dependencies derived from *other* package's data
         for other_package in self.game.packages.values():
             if other_package.expansion_for == package.name:

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