[Python-checkins] CVS: python/dist/src/Lib/distutils/command install_data.py,1.16,1.17

[Jack Jansen]

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

Modified Files:
	install_data.py 
Log Message:
Data pathnames were not converted from URL-style to local style. Fixed.


Index: install_data.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install_data.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** install_data.py	2000/10/14 04:06:40	1.16
--- install_data.py	2001/01/28 12:22:14	1.17
***************
*** 11,15 ****
  from types import StringType
  from distutils.core import Command
! from distutils.util import change_root
  
  class install_data (Command):
--- 11,15 ----
  from types import StringType
  from distutils.core import Command
! from distutils.util import change_root, convert_path
  
  class install_data (Command):
***************
*** 49,52 ****
--- 49,53 ----
              if type(f) == StringType:
                  # it's a simple file, so copy it
+                 f = convert_path(f)
                  if self.warn_dir:
                      self.warn("setup script did not provide a directory for "
***************
*** 57,61 ****
              else:
                  # it's a tuple with path to install to and a list of files
!                 dir = f[0]
                  if not os.path.isabs(dir):
                      dir = os.path.join(self.install_dir, dir)
--- 58,62 ----
              else:
                  # it's a tuple with path to install to and a list of files
!                 dir = convert_path(f[0])
                  if not os.path.isabs(dir):
                      dir = os.path.join(self.install_dir, dir)
***************
*** 64,67 ****
--- 65,69 ----
                  self.mkpath(dir)
                  for data in f[1]:
+                     data = convert_path(f[1])
                      (out, _) = self.copy_file(data, dir)
                      self.outfiles.append(out)