[game-data-packager] 06/13: Fix Python/YAML code for DESTDIR having moved into slipstream.unpacked

[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 c62871917b8bf5d001b3a5ba4e5f593ecf8865d6
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jan 4 20:21:10 2015 +0000

    Fix Python/YAML code for DESTDIR having moved into slipstream.unpacked
---
 lib/game_data_packager/__init__.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index f8098b9..931f6c1 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -967,11 +967,7 @@ class GameData(object):
         shutil.copyfile(os.path.join(self.datadir, 'changelog.gz'),
                 os.path.join(docdir, 'changelog.gz'))
 
-        # slipstream_instsize, slipstream_repack assume that
-        # slipstream.unpacked and DEBIAN are in the same place.
-        # The shell script code puts slipstream.unpacked in workdir.
-        assert destdir == self.workdir + '/slipstream.unpacked'
-        debdir = os.path.join(self.workdir, 'DEBIAN')
+        debdir = os.path.join(destdir, 'DEBIAN')
         mkdir_p(debdir)
         shutil.copyfile(os.path.join(self.datadir, package.name + '.control'),
                 os.path.join(debdir, 'control'))

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