[Python-checkins] CVS: python/dist/src/Lib/distutils/command build_py.py,1.34,1.35

Thomas Heller theller@users.sourceforge.net
Fri, 01 Feb 2002 01:44:11 -0800


Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv15304

Modified Files:
	build_py.py 
Log Message:
package_dir must be converted from the distutils path conventions to
local conventions before being used by build_py.

Fixes SF bug #509288, probably a candidate for 2.2.1


Index: build_py.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_py.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** build_py.py	2001/12/06 20:59:17	1.34
--- build_py.py	2002/02/01 09:44:09	1.35
***************
*** 13,16 ****
--- 13,17 ----
  from distutils.core import Command
  from distutils.errors import *
+ from distutils.util import convert_path
  
  
***************
*** 51,55 ****
          self.packages = self.distribution.packages
          self.py_modules = self.distribution.py_modules
!         self.package_dir = self.distribution.package_dir
  
          # Ick, copied straight from install_lib.py (fancy_getopt needs a
--- 52,59 ----
          self.packages = self.distribution.packages
          self.py_modules = self.distribution.py_modules
!         self.package_dir = {}
!         if self.distribution.package_dir:
!             for name, path in self.distribution.package_dir.items():
!                 self.package_dir[name] = convert_path(path)
  
          # Ick, copied straight from install_lib.py (fancy_getopt needs a