[game-data-packager] 05/07: When unpacking an archive into a directory, consider all unpacked files

[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 2f6e3bd6dc6c48c4a1d729fd47e685d38471d0ff
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Oct 21 08:42:03 2015 +0100

    When unpacking an archive into a directory, consider all unpacked files
    
    This means we can use consider_file_or_dir's new support for
    printing an error message if a file we expected to unpack is not
    actually present, but g-d-p will still continue without crashing.
---
 game_data_packager/build.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 285788a..f1f4bc1 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1069,8 +1069,7 @@ class PackagingTask(object):
                     check_call(['lha', arg, os.path.abspath(found_name)] +
                             list(to_unpack),
                             cwd=tmpdir)
-                    for f in to_unpack:
-                        self.consider_file(os.path.join(tmpdir, f), True)
+                    self.consider_file_or_dir(tmpdir, provider=provider)
                 elif fmt == 'id-shr-extract':
                     to_unpack = provider.unpack.get('unpack', provider.provides)
                     logger.debug('Extracting %r from %s',
@@ -1083,9 +1082,7 @@ class PackagingTask(object):
                     # this format doesn't store a timestamp, so the extracted
                     # files will instead inherit the archive's timestamp
                     recursive_utime(tmpdir, os.stat(found_name).st_mtime)
-                    for f in to_unpack:
-                        tmp = os.path.join(tmpdir, f)
-                        self.consider_file(tmp, True)
+                    self.consider_file_or_dir(tmpdir, provider=provider)
                 elif fmt == 'cabextract':
                     to_unpack = provider.unpack.get('unpack', provider.provides)
                     logger.debug('Extracting %r from %s',

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