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

[Greg Ward]

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

Modified Files:
	core.py 
Log Message:
Catch DistutilSetupError from the Distribution constructor.

Index: core.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/core.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** core.py	2000/06/02 01:55:36	1.40
--- core.py	2000/06/03 01:02:06	1.41
***************
*** 9,13 ****
  # created 1999/03/01, Greg Ward
  
! __revision__ = "$Id: core.py,v 1.40 2000/06/02 01:55:36 gward Exp $"
  
  import sys, os
--- 9,13 ----
  # created 1999/03/01, Greg Ward
  
! __revision__ = "$Id: core.py,v 1.41 2000/06/03 01:02:06 gward Exp $"
  
  import sys, os
***************
*** 81,85 ****
      # Create the Distribution instance, using the remaining arguments
      # (ie. everything except distclass) to initialize it
!     dist = klass (attrs)
  
      # Find and parse the config file(s): they will override options from
--- 81,88 ----
      # Create the Distribution instance, using the remaining arguments
      # (ie. everything except distclass) to initialize it
!     try:
!         dist = klass (attrs)
!     except DistutilsSetupError, msg:
!         raise SystemExit, "error in setup script: %s" % msg
  
      # Find and parse the config file(s): they will override options from