[Python-checkins] CVS: distutils/distutils/command sdist.py,1.40,1.41

[Greg Ward]

Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv27807/command

Modified Files:
	sdist.py 
Log Message:
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.

Index: sdist.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/sdist.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** sdist.py	2000/07/30 01:30:31	1.40
--- sdist.py	2000/07/30 01:47:16	1.41
***************
*** 15,19 ****
       check_archive_formats
  from distutils.text_file import TextFile
! from distutils.errors import DistutilsExecError, DistutilsOptionError
  from distutils.filelist import FileList
  
--- 15,19 ----
       check_archive_formats
  from distutils.text_file import TextFile
! from distutils.errors import *
  from distutils.filelist import FileList
  
***************
*** 228,231 ****
--- 228,233 ----
                            self.template)
  
+             self.filelist.findall()
+ 
              # Add default file set to 'files'
              if self.use_defaults:
***************
*** 336,340 ****
                  break
  
!             self.filelist.process_template_line(line)
  
      # read_template ()
--- 338,347 ----
                  break
  
!             try:
!                 self.filelist.process_template_line(line)
!             except DistutilsTemplateError, msg:
!                 self.warn("%s, line %d: %s" % (template.filename,
!                                                template.current_line,
!                                                msg))
  
      # read_template ()