[Pkg-privacy-commits] [tails-installer] 36/40: Gracefully handle exception messages of all types (#1044309)

[anonym]

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

anonym-tails-guest pushed a commit to annotated tag 3.13.1
in repository tails-installer.

commit 3050a5f0b1776df47b3daeafcac4dd9fb49f5e84
Author: Luke Macken <lmacken at redhat.com>
Date:   Wed Nov 26 23:31:24 2014 -0700

    Gracefully handle exception messages of all types (#1044309)
---
 liveusb/gui.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/liveusb/gui.py b/liveusb/gui.py
index 3564288..01992ce 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -483,9 +483,7 @@ class LiveUSBWindow(QtGui.QMainWindow, LiveUSBInterface):
         self.progressBar.setMaximum(value)
 
     def status(self, text):
-        if isinstance(text, Exception):
-            text = text.args[0]
-        elif isinstance(text, int):
+        if not isinstance(text, basestring):
             text = str(text)
         self.textEdit.append(text)
 

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