mirror of https://github.com/python/cpython.git
Catch syntax errors from processing template lines and turn them into
mere warnings. Call 'findall()' on our FileList object before we start using it seriously.
This commit is contained in:
parent
979db976a3
commit
6b24dffd13
|
@ -14,7 +14,7 @@
|
|||
create_tree, remove_tree, newer, write_file, \
|
||||
check_archive_formats
|
||||
from distutils.text_file import TextFile
|
||||
from distutils.errors import DistutilsExecError, DistutilsOptionError
|
||||
from distutils.errors import *
|
||||
from distutils.filelist import FileList
|
||||
|
||||
|
||||
|
@ -227,6 +227,8 @@ def get_file_list (self):
|
|||
"(using default file list)") %
|
||||
self.template)
|
||||
|
||||
self.filelist.findall()
|
||||
|
||||
# Add default file set to 'files'
|
||||
if self.use_defaults:
|
||||
self.add_defaults()
|
||||
|
@ -335,7 +337,12 @@ def read_template (self):
|
|||
if line is None: # end of file
|
||||
break
|
||||
|
||||
self.filelist.process_template_line(line)
|
||||
try:
|
||||
self.filelist.process_template_line(line)
|
||||
except DistutilsTemplateError, msg:
|
||||
self.warn("%s, line %d: %s" % (template.filename,
|
||||
template.current_line,
|
||||
msg))
|
||||
|
||||
# read_template ()
|
||||
|
||||
|
|
Loading…
Reference in New Issue