]> git.bitcoin.ninja Git - youtube-dl/commitdiff
Clear up error messages (#734)
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 8 Mar 2013 19:12:05 +0000 (20:12 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 8 Mar 2013 19:12:05 +0000 (20:12 +0100)
youtube_dl/FileDownloader.py

index 57f741c306470ca174cdb0f1681885f8ee4872dc..3b2adf84beef5df29d74535d692d926d309a619c 100644 (file)
@@ -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):