[game-data-packager] 15/16: run_command_line: build all packages if argument matches game name

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository game-data-packager.

commit c6ea5c8a9e26d09d8492a3580a27385138f3f320
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jan 7 12:52:18 2016 +0000

    run_command_line: build all packages if argument matches game name
    
    Normally, a game "foo" builds packages that include "foo-data" but
    not "foo", so it's OK to have the shorthand that "g-d-p foo-data"
    builds exactly that package and no more. However, this breaks down
    if we want a game to build a package whose name is the same as the
    game itself.
    
    We avoided this for Unreal entirely by mistake, because we don't
    build an unreal.deb (because unreal-classic and unreal-gold are
    co-installable), but for Unreal Tournament we want to make the
    "main package" match the game name.
---
 game_data_packager/build.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index d35c81b..32a6ced 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -2024,7 +2024,8 @@ class PackagingTask(object):
                 args.shortname = package.name
                 break
 
-        if args.shortname in self.game.packages:
+        if (args.shortname != self.game.shortname and
+                args.shortname in self.game.packages):
             if args.packages and args.packages != [args.shortname]:
                 not_the_one = [p for p in args.packages if p != args.shortname]
                 logger.error('--package="%s" is not consistent with '

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