Clear up error messages (#734)
This commit is contained in:
parent
c2e21f2f0d
commit
e5edd51de4
1 changed files with 5 additions and 2 deletions
|
@ -372,8 +372,11 @@ class FileDownloader(object):
|
||||||
|
|
||||||
filename = self.params['outtmpl'] % template_dict
|
filename = self.params['outtmpl'] % template_dict
|
||||||
return filename
|
return filename
|
||||||
except (ValueError, KeyError) as err:
|
except KeyError as err:
|
||||||
self.trouble(u'ERROR: invalid system charset or erroneous output template')
|
self.trouble(u'ERROR: Erroneous output template')
|
||||||
|
return None
|
||||||
|
except ValueError as err:
|
||||||
|
self.trouble(u'ERROR: Insufficient system charset ' + repr(preferredencoding()))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def _match_entry(self, info_dict):
|
def _match_entry(self, info_dict):
|
||||||
|
|
Loading…
Reference in a new issue