[Python-checkins] CVS: distutils/distutils/command sdist.py,1.14,1.15

[Greg Ward]

Update of /projects/cvsroot/distutils/distutils/command
In directory newcnri:/tmp/cvs-serv24684/command

Modified Files:
	sdist.py 
Log Message:
Check that 'self.formats' is good early on.

Index: sdist.py
===================================================================
RCS file: /projects/cvsroot/distutils/distutils/command/sdist.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** sdist.py	2000/04/22 02:51:24	1.14
--- sdist.py	2000/04/22 03:11:55	1.15
***************
*** 5,9 ****
  # created 1999/09/22, Greg Ward
  
! __revision__ = "$Id: sdist.py,v 1.14 2000/04/22 02:51:24 gward Exp $"
  
  import sys, os, string, re
--- 5,9 ----
  # created 1999/09/22, Greg Ward
  
! __revision__ = "$Id: sdist.py,v 1.15 2000/04/22 03:11:55 gward Exp $"
  
  import sys, os, string, re
***************
*** 12,19 ****
  from glob import glob
  from distutils.core import Command
! from distutils.util import \
!      newer, create_tree, remove_tree, make_tarball, make_zipfile, native_path
  from distutils.text_file import TextFile
! from distutils.errors import DistutilsExecError
  
  
--- 12,19 ----
  from glob import glob
  from distutils.core import Command
! from distutils.util import newer, create_tree, remove_tree, native_path
! from distutils.archive_util import check_archive_formats
  from distutils.text_file import TextFile
! from distutils.errors import DistutilsExecError, DistutilsOptionError
  
  
***************
*** 81,84 ****
--- 81,89 ----
          elif type (self.formats) is StringType:
              self.formats = string.split (self.formats, ',')
+ 
+         bad_format = check_archive_formats (self.formats)
+         if bad_format:
+             raise DistutilsOptionError, \
+                   "unknown archive format '%s'" % bad_format