[game-data-packager] 01/01: InnoExtract: obey to --verbose on unknown archives too
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Wed Sep 30 08:13:08 UTC 2015
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 88a5c84b5a7e408022c43fad58fc801d157616b7
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Wed Sep 30 10:11:44 2015 +0200
InnoExtract: obey to --verbose on unknown archives too
without this, the sums of .bin can get lost before
pages of innoextract output
---
game_data_packager/__init__.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 6dcbba8..98fde19 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -1216,6 +1216,10 @@ class GameData(object):
basename = os.path.basename(path)
extension = os.path.splitext(basename)[1]
if trusted:
+ logger.warning('\n\nPlease report this unknown archive to '
+ 'game-data-packager at packages.debian.org\n\n'
+ ' %-9s %s %s\n'
+ ' %s %s\n' % (size, hashes.md5, basename, hashes.sha1, basename))
if basename.startswith('gog_') and extension == '.sh':
with zipfile.ZipFile(path, 'r') as zf:
self.consider_zip(path, zf)
@@ -1223,6 +1227,10 @@ class GameData(object):
version = subprocess.check_output(['innoextract', '-v', '-s'],
universal_newlines=True)
args = ['-I', '/app'] if version.split('-')[0] >= '1.5' else []
+ if not self.verbose:
+ args.append('--silent')
+ logger.info('extracting %s (%d bytes) with InnoExtract...'
+ % (basename, size))
tmpdir = os.path.join(self.get_workdir(), 'tmp',
basename + '.d')
mkdir_p(tmpdir)
@@ -1232,12 +1240,6 @@ class GameData(object):
'-d', tmpdir,
path] + args)
self.consider_file_or_dir(tmpdir)
- # print warning after innoextract's output,
- # to give user a chance to read it
- logger.warning('\n\nPlease report this unknown archive to '
- 'game-data-packager at packages.debian.org\n\n'
- ' %-9s %s %s\n'
- ' %s %s\n' % (size, hashes.md5, basename, hashes.sha1, basename))
elif really_should_match_something:
logger.warning('file "%s" does not match any known file', path)
# ... still G-D-P should try to process any random .zip
--
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