youtube-dl

commit e5edd51de458d52f3824e6d8fc7c0713659694a4
parent c2e21f2f0da6a2ec682fab3ba75b1aae98586c96
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Fri,  8 Mar 2013 20:12:05 +0100

Clear up error messages (#734)

Diffstat:
M
youtube_dl/FileDownloader.py
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
@@ -372,8 +372,11 @@ class FileDownloader(object):
 
             filename = self.params['outtmpl'] % template_dict
             return filename
-        except (ValueError, KeyError) as err:
-            self.trouble(u'ERROR: invalid system charset or erroneous output template')
+        except KeyError as err:
+            self.trouble(u'ERROR: Erroneous output template')
+            return None
+        except ValueError as err:
+            self.trouble(u'ERROR: Insufficient system charset ' + repr(preferredencoding()))
             return None
 
     def _match_entry(self, info_dict):