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 4146921fa06aee476d6d011a92ae3fee9ac8a81b Author: Simon McVittie <[email protected]> Date: Mon Jan 4 23:46:34 2016 +0000 GameData: look in {rpm,debian} as lower priority than {arch,fedora,suse} For now I'm treating "Debian packaging" as more like a packaging format than a distribution, because Debian derivatives are quite close, whereas RPM-based distributions have diverged. --- doc/tags.txt | 5 ++++- game_data_packager/__init__.py | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/tags.txt b/doc/tags.txt index 16aa307..4eac6fe 100644 --- a/doc/tags.txt +++ b/doc/tags.txt @@ -44,7 +44,10 @@ packages: provides: recommends: replaces: - fedora: + engine: string + install_to: string + description: string + rpm|fedora|suse|arch: (fedora/suse takes priority over rpm) engine: string install_to: string description: string diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py index 43af8b5..8a759c8 100644 --- a/game_data_packager/__init__.py +++ b/game_data_packager/__init__.py @@ -37,7 +37,7 @@ from .gog import run_gog_meta_mode from .paths import (DATADIR, USE_VFS) from .util import ascii_safe from .steam import run_steam_meta_mode -from .version import (GAME_PACKAGE_VERSION, DISTRO, ASSETS) +from .version import (ASSETS, DISTRO, FORMAT, GAME_PACKAGE_VERSION) logging.basicConfig() logger = logging.getLogger('game-data-packager') @@ -800,6 +800,12 @@ class GameData(object): if k in d: setattr(package, k, d[k]) + for port in ('debian', 'rpm'): + if FORMAT == port and port in d: + for k in ('engine', 'install_to', 'description'): + if k in d[port]: + setattr(package, k, d[port][k]) + for port in ('arch', 'fedora', 'suse'): if DISTRO == port and port in d: for k in ('engine', 'install_to', 'description'): -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
