[game-data-packager] 01/01: lower 'warning' message to 'info' about missing exotic unpacker

[Alexandre Detiste]

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 16ae8cb29c30cbf0772ce9655582b1746abca1f1
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Wed May 10 10:54:07 2017 +0200

    lower 'warning' message to 'info' about missing exotic unpacker
    
    if assets can also be found in some other archive which
    don't need this unpacker
---
 debian/changelog            |  3 +++
 game_data_packager/build.py | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf1c88a..b0ce647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ game-data-packager (51) UNRELEASED; urgency=medium
     - Commander Keen: Goodbye Galaxy (part of #786501) [skitt]
   * Enhancements and bug fixes:
     - Only try once to download files which have changed [adetiste]
+  * Enhancements and bug fixes:
+    - Lower 'warning' message to 'info' about missing exotic unpacker
+      if needed assets can found in other downloadable archives [adetiste]
 
  -- Simon McVittie <smcv at debian.org>  Thu, 04 May 2017 10:21:26 +0100
 
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 35857c6..480a135 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -831,7 +831,8 @@ class PackagingTask(object):
             provider = self.game.files[provider_name]
 
             # don't bother if we wouldn't be able to unpack it anyway
-            if not self.check_unpacker(provider):
+            if not self.check_unpacker(provider, log_as_warning=
+                          self.file_status[wanted.name] is FillResult.IMPOSSIBLE):
                 continue
 
             # recurse to unpack or (see whether we can) download the provider
@@ -1642,6 +1643,7 @@ class PackagingTask(object):
         except DownloadNotAllowed:
             logger.error('Unable to complete any packages because ' +
                     'downloading missing files was not allowed.')
+            self.log_missing_tools()
             raise SystemExit(1)
         except DownloadsFailed:
             # we already logged an error
@@ -2176,7 +2178,7 @@ class PackagingTask(object):
                  return
         return
 
-    def check_unpacker(self, wanted):
+    def check_unpacker(self, wanted, log_as_warning):
         if not wanted.unpack:
             return True
 
@@ -2203,8 +2205,14 @@ class PackagingTask(object):
                 self.builder_packaging.is_installed('unace-nonfree')):
             return True
 
-        logger.warning('cannot unpack "%s": tool "%s" is not ' +
-                       'installed', wanted.name, fmt)
+
+        if log_as_warning:
+            logger.warning('cannot unpack "%s": tool "%s" is not ' +
+                           'installed', wanted.name, fmt)
+        else:
+            logger.info('cannot unpack "%s": tool "%s" is not ' +
+                        'installed', wanted.name, fmt)
+
         self.missing_tools.add(fmt)
         self.unpack_tried.add(wanted.name)
         return False

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