[game-data-packager] 01/01: packaging: make all constant upercase, explain PACKAGE_MAP

[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 9a64adb4cbacff15d68f4ac81559b286804f9a0a
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Thu Jan 7 13:28:07 2016 +0100

    packaging: make all constant upercase, explain PACKAGE_MAP
---
 game_data_packager/build.py              | 4 ++--
 game_data_packager/packaging/__init__.py | 9 ++++++---
 game_data_packager/packaging/arch.py     | 5 ++---
 game_data_packager/packaging/deb.py      | 6 +++---
 game_data_packager/packaging/rpm.py      | 9 +++++----
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 7e30cb9..47a4e70 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -2749,10 +2749,10 @@ class PackagingTask(object):
         packages = set()
 
         for t in self.missing_tools:
-            p = self.packaging.package_map.get(t, t)
+            p = self.packaging.PACKAGE_MAP.get(t, t)
             if p is not None:
                 packages.add(p)
 
         if packages:
             logger.warning('installing these packages might help:\n' +
-                '%s %s', self.packaging.install_cmd, ' '.join(sorted(packages)))
+                '%s %s', self.packaging.INSTALL_CMD, ' '.join(sorted(packages)))
diff --git a/game_data_packager/packaging/__init__.py b/game_data_packager/packaging/__init__.py
index 33f7755..a17a3f6 100644
--- a/game_data_packager/packaging/__init__.py
+++ b/game_data_packager/packaging/__init__.py
@@ -24,9 +24,12 @@ class PackagingSystem(metaclass=ABCMeta):
     ASSETS = 'usr/share'
     BINDIR = 'usr/bin'
     LICENSEDIR = 'usr/share/doc'
-
-    install_cmd = None
-    package_map = dict()
+    CHECK_CMD = None
+    INSTALL_CMD = None
+    # by default pgm 'unzip' is provided by package 'unzip' etc...
+    # only exceptions needs to be listed
+    # 'None' means that this pgm is not packaged by $distro
+    PACKAGE_MAP = dict()
 
     def __init__(self):
         self._architecture = None
diff --git a/game_data_packager/packaging/arch.py b/game_data_packager/packaging/arch.py
index a9b209b..7ca354b 100644
--- a/game_data_packager/packaging/arch.py
+++ b/game_data_packager/packaging/arch.py
@@ -27,9 +27,8 @@ logger = logging.getLogger(__name__)
 
 class ArchPackaging(PackagingSystem):
     LICENSEDIR = 'usr/share/licenses'
-
-    install_cmd = 'pacman -S'
-    package_map = {
+    INSTALL_CMD = 'pacman -S'
+    PACKAGE_MAP = {
                   'id-shr-extract': None,
                   '7z': 'p7zip',
                   # XXX
diff --git a/game_data_packager/packaging/deb.py b/game_data_packager/packaging/deb.py
index 6ede498..3496707 100644
--- a/game_data_packager/packaging/deb.py
+++ b/game_data_packager/packaging/deb.py
@@ -30,9 +30,9 @@ logger = logging.getLogger(__name__)
 class DebPackaging(PackagingSystem):
     BINDIR = 'usr/games'
     ASSETS = 'usr/share/games'
-
-    install_cmd = 'apt-get install'
-    package_map = {
+    CHECK_CMD = 'lintian'
+    INSTALL_CMD = 'apt-get install'
+    PACKAGE_MAP = {
                   'id-shr-extract': 'dynamite',
                   'lha': 'lhasa',
                   '7z': 'p7zip-full',
diff --git a/game_data_packager/packaging/rpm.py b/game_data_packager/packaging/rpm.py
index 163e50d..6365dda 100644
--- a/game_data_packager/packaging/rpm.py
+++ b/game_data_packager/packaging/rpm.py
@@ -26,6 +26,7 @@ from ..util import (check_output, run_as_root)
 logger = logging.getLogger(__name__)
 
 class RpmPackaging(PackagingSystem):
+    CHECK_CMD = 'rpmlint'
     LICENSEDIR = 'usr/share/licenses'
 
     def is_installed(self, package):
@@ -73,8 +74,8 @@ class RpmPackaging(PackagingSystem):
 #      As install_packages() needs root, we need to use the 'dnf' pgm
 
 class DnfPackaging(RpmPackaging):
-    install_cmd = 'dnf install'
-    package_map = {
+    INSTALL_CMD = 'dnf install'
+    PACKAGE_MAP = {
                   'dpkg-deb': 'dpkg',
                   'id-shr-extract': None,
                   '7z': 'p7zip-plugins',
@@ -118,8 +119,8 @@ class DnfPackaging(RpmPackaging):
                 gain_root=gain_root)
 
 class ZypperPackaging(RpmPackaging):
-    install_cmd = 'zypper install'
-    package_map = {
+    INSTALL_CMD = 'zypper install'
+    PACKAGE_MAP = {
                   'dpkg-deb': 'dpkg',
                   'id-shr-extract': None,
                   '7z': 'p7zip',

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