[Pkg-privacy-commits] [tails-installer] 34/43: Logging: don't display in the GUI error the output from commands that are allowed to fail.

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch debian/sid
in repository tails-installer.

commit d5cc147a9eb8f003f4d8f924026a60514ed008c8
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Jul 21 19:11:52 2016 +0000

    Logging: don't display in the GUI error the output from commands that are allowed to fail.
    
    Otherwise, since the recent logging changes, on Debian these error
    messages appear in the GUI, while they previously did not, and should
    not:
    
      ['/sbin/sgdisk', '--print', '/dev/sdb']
      Problem opening /dev/sdb for reading! Error is 13.
      You must run this program as root or use sudo!
    
      ['/sbin/sgdisk', '--zap-all', '/dev/sdb']
      Problem opening /dev/sdb for reading! Error is 13.
      You must run this program as root or use sudo!
      Problem opening '' for writing! Program will now terminate.
      Warning! MBR not overwritten! Error is 2!
---
 tails_installer/creator.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index 2ed77fa..587fab3 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -294,8 +294,10 @@ class TailsInstallerCreator(object):
         err = unicode_to_utf8(err)
         self.output.write(out + '\n' + err + '\n')
         if proc.returncode:
-            self.log.info(self.output.getvalue())
-            if not passive:
+            if passive:
+                self.log.debug(self.output.getvalue())
+            else:
+                self.log.info(self.output.getvalue())
                 raise TailsInstallerError(_(
                         "There was a problem executing the following command: `%(command)s`.\nA more detailed error log has been written to '%(filename)s'.")
                         % {'command': cmd, 'filename': self._error_log_filename})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git