[game-data-packager] 19/25: DoomTask: don't override fill_dest_dir_deb

Simon McVittie smcv at debian.org
Sun Oct 9 21:26:07 UTC 2016


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 f81b17ae7e5dce7bcdd1b9b1c5e1b8bcfe2b1ad6
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Oct 9 18:44:49 2016 +0100

    DoomTask: don't override fill_dest_dir_deb
    
    This was in the way of some refactoring.
---
 game_data_packager/games/doom_common.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py
index 681f26e..139240b 100644
--- a/game_data_packager/games/doom_common.py
+++ b/game_data_packager/games/doom_common.py
@@ -174,19 +174,18 @@ class DoomTask(PackagingTask):
                     'usr/share/applications/%s.desktop %s' %
                      (desktop_file, program))
 
-    def fill_dest_dir_deb(self, package, destdir):
-        for main_wad in package.main_wads:
-            if main_wad in ('doom.wad', 'doom2.wad', 'plutonia.wad', 'tnt.wad'):
-                debdir = os.path.join(destdir, 'DEBIAN')
-                mkdir_p(debdir)
-                copy_with_substitutions(
-                    open(os.path.join(DATADIR, 'doom-common.preinst.in'),
-                        encoding='utf-8'),
-                    open(os.path.join(debdir, 'preinst'), 'w',
-                        encoding='utf-8'),
-                    IWAD=main_wad)
-                os.chmod(os.path.join(debdir, 'preinst'), 0o755)
-
-        super(DoomTask, self).fill_dest_dir_deb(package, destdir)
+        if self.packaging.derives_from('deb'):
+            for main_wad in package.main_wads:
+                if main_wad in ('doom.wad', 'doom2.wad', 'plutonia.wad',
+                        'tnt.wad'):
+                    debdir = os.path.join(destdir, 'DEBIAN')
+                    mkdir_p(debdir)
+                    copy_with_substitutions(
+                        open(os.path.join(DATADIR, 'doom-common.preinst.in'),
+                            encoding='utf-8'),
+                        open(os.path.join(debdir, 'preinst'), 'w',
+                            encoding='utf-8'),
+                        IWAD=main_wad)
+                    os.chmod(os.path.join(debdir, 'preinst'), 0o755)
 
 GAME_DATA_SUBCLASS = DoomGameData

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



More information about the Pkg-games-commits mailing list