[Python-checkins] CVS: python/dist/src setup.py,1.84,1.85

[Neal Norwitz]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv27410

Modified Files:
	setup.py 
Log Message:
Fix SF # 532618 517704, install problems when building modules fail.
Fix whitespace on a line also.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** setup.py	7 Mar 2002 09:58:56 -0000	1.84
--- setup.py	25 Mar 2002 14:20:09 -0000	1.85
***************
*** 189,194 ****
                  # _built_objects attribute is stored there strictly for
                  # use here.
!                 for filename in self._built_objects:
!                     os.remove(filename)
              else:
                  self.announce('*** WARNING: importing extension "%s" '
--- 189,199 ----
                  # _built_objects attribute is stored there strictly for
                  # use here.
!                 # If there is a failure, _built_objects may not be there,
!                 # so catch the AttributeError and move on.
!                 try:
!                     for filename in self._built_objects:
!                         os.remove(filename)
!                 except AttributeError:
!                     self.announce('unable to remove files (ignored)')
              else:
                  self.announce('*** WARNING: importing extension "%s" '
***************
*** 606,610 ****
              frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
              exts.append( Extension('gestalt', ['gestaltmodule.c'],
!             		extra_link_args=['-framework', 'Carbon']) )
              exts.append( Extension('MacOS', ['macosmodule.c'],
                          extra_link_args=['-framework', 'Carbon']) )
--- 611,615 ----
              frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
              exts.append( Extension('gestalt', ['gestaltmodule.c'],
!                     	extra_link_args=['-framework', 'Carbon']) )
              exts.append( Extension('MacOS', ['macosmodule.c'],
                          extra_link_args=['-framework', 'Carbon']) )