[game-data-packager] 01/01: don't duplicate compress Y/N logic in each distro module

[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 5736a7cbd477bc79bdf98fa5c8987d3fe4d237c3
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Wed Mar 15 00:48:24 2017 +0100

    don't duplicate compress Y/N logic in each distro module
---
 game_data_packager/build.py         | 10 +++++++++-
 game_data_packager/packaging/deb.py | 15 ++++++---------
 game_data_packager/packaging/rpm.py |  5 +----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index bb86ab0..53e416a 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -2019,8 +2019,16 @@ class PackagingTask(object):
             destdir = os.path.join(per_package_dir, 'DESTDIR')
             self.fill_dest_dir(package, destdir)
 
+
+            # only compress if the caller says we should, the YAML
+            # says it's worthwhile, and this isn't a ripped CD
+            # (Vorbis is already compressed)
+            compress_pkg = compress and not package.rip_cd
+            if compress_pkg:
+                compress_pkg = self.game.compress_deb
+
             pkg = self.packaging.build_package(per_package_dir, self.game,
-                    package, destination, compress=compress,
+                    package, destination, compress=compress_pkg,
                     md5sums=self.package_md5sums.get(package.name),
                     component=self.package_components[package.name])
             assert pkg is not None
diff --git a/game_data_packager/packaging/deb.py b/game_data_packager/packaging/deb.py
index b848a70..a1cbb2c 100644
--- a/game_data_packager/packaging/deb.py
+++ b/game_data_packager/packaging/deb.py
@@ -396,17 +396,14 @@ class DebPackaging(PackagingSystem):
 
         outfile = os.path.join(os.path.abspath(destination), deb_basename)
 
-        # only compress if the caller says we should, the YAML
-        # says it's worthwhile, and this isn't a ripped CD (Vorbis
-        # is already compressed)
-        if not compress or not game.compress_deb or package.rip_cd:
+        if not compress:
             dpkg_deb_args = ['-Znone']
-        elif game.compress_deb is True:
+        elif compress is True:
             dpkg_deb_args = []
-        elif isinstance(game.compress_deb, str):
-            dpkg_deb_args = ['-Z' + game.compress_deb]
-        elif isinstance(game.compress_deb, list):
-            dpkg_deb_args = game.compress_deb
+        elif isinstance(compress, str):
+            dpkg_deb_args = ['-Z' + compress]
+        elif isinstance(compress, list):
+            dpkg_deb_args = compress
 
         try:
             logger.info('generating package %s', package.name)
diff --git a/game_data_packager/packaging/rpm.py b/game_data_packager/packaging/rpm.py
index de2d2c7..45bdddb 100644
--- a/game_data_packager/packaging/rpm.py
+++ b/game_data_packager/packaging/rpm.py
@@ -207,7 +207,7 @@ class RpmPackaging(PackagingSystem):
 
             # FIXME: replaces?
 
-            if not compress or package.rip_cd:
+            if not compress:
                 spec.write('%define _binary_payload w0.gzdio\n')
             elif compress == ['-Zgzip', '-z1']:
                 spec.write('%define _binary_payload w1.gzdio\n')
@@ -259,9 +259,6 @@ class RpmPackaging(PackagingSystem):
         if self.distro is not None:
             release = release + '.' + self.distro
 
-        if compress:
-            compress = game.compress_deb
-
         specfile = self.__fill_dest_dir_rpm(game, package,
                 per_package_dir, destdir, compress, arch, release)
         normalize_permissions(destdir)

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