[game-data-packager] 02/04: Let individual files' install_to expand package's $install_to

[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 1dd31a66e9bfabcad82e856b4b07f4fa60e560ea
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Jan 19 23:59:40 2016 +0000

    Let individual files' install_to expand package's $install_to
---
 game_data_packager/build.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 86221a1..cee62dc 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1653,14 +1653,13 @@ class PackagingTask(object):
             with TemporaryUmask(0o22):
                 logger.debug('Found %s at %s', wanted.name, copy_from)
 
-                install_to = wanted.install_to
-
-                if install_to is None:
-                    install_to = package.install_to
-
-                install_to = self.packaging.substitute(install_to,
+                install_to = self.packaging.substitute(package.install_to,
                         package.name).lstrip('/')
 
+                if wanted.install_to is not None:
+                    install_to = self.packaging.substitute(wanted.install_to,
+                            package.name, install_to=install_to)
+
                 copy_to = os.path.join(destdir, install_to, install_as)
                 copy_to_dir = os.path.dirname(copy_to)
                 logger.debug('Copying to %s', copy_to)

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