[Python-checkins] CVS: distutils/distutils/command install_data.py,1.6,1.7

Greg Ward python-dev@python.org
Wed, 24 May 2000 19:14:28 -0700


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

Modified Files:
	install_data.py 
Log Message:
Fix to use 'change_root()' rather than directly mangling path.

Index: install_data.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install_data.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** install_data.py	2000/05/25 01:19:18	1.6
--- install_data.py	2000/05/25 02:14:26	1.7
***************
*** 6,14 ****
  # contributed by Bastian Kleineidam
  
! __revision__ = "$Id: install_data.py,v 1.6 2000/05/25 01:19:18 gward Exp $"
  
  import os
  from types import StringType
  from distutils.core import Command
  
  class install_data (Command):
--- 6,15 ----
  # contributed by Bastian Kleineidam
  
! __revision__ = "$Id: install_data.py,v 1.7 2000/05/25 02:14:26 gward Exp $"
  
  import os
  from types import StringType
  from distutils.core import Command
+ from distutils.util import change_root
  
  class install_data (Command):
***************
*** 47,51 ****
                      dir = os.path.join(self.install_dir, dir)
                  elif self.root:
!                     dir = os.path.join(self.root, dir[1:])
                  self.mkpath(dir)
                  for data in f[1]:
--- 48,52 ----
                      dir = os.path.join(self.install_dir, dir)
                  elif self.root:
!                     dir = change_root(self.root, dir)
                  self.mkpath(dir)
                  for data in f[1]: