Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Data pathnames were not converted from URL-style to local style. Fixed.

This commit is contained in:
Jack Jansen 2001-01-28 12:22:14 +00:00
parent 646ddec41f
commit a221b2a7a9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/distutils/command/install_data.py
View File

@ -10,7 +10,7 @@
import os import os
from types import StringType from types import StringType
from distutils.core import Command from distutils.core import Command
from distutils.util import change_root from distutils.util import change_root, convert_path
class install_data (Command): class install_data (Command):
@ -48,6 +48,7 @@ def run (self):
for f in self.data_files: for f in self.data_files:
if type(f) == StringType: if type(f) == StringType:
# it's a simple file, so copy it # it's a simple file, so copy it
f = convert_path(f)
if self.warn_dir: if self.warn_dir:
self.warn("setup script did not provide a directory for " self.warn("setup script did not provide a directory for "
"'%s' -- installing right in '%s'" % "'%s' -- installing right in '%s'" %
@ -56,13 +57,14 @@ def run (self):
self.outfiles.append(out) self.outfiles.append(out)
else: else:
# it's a tuple with path to install to and a list of files # it's a tuple with path to install to and a list of files
dir = f[0] dir = convert_path(f[0])
if not os.path.isabs(dir): if not os.path.isabs(dir):
dir = os.path.join(self.install_dir, dir) dir = os.path.join(self.install_dir, dir)
elif self.root: elif self.root:
dir = change_root(self.root, dir) dir = change_root(self.root, dir)
self.mkpath(dir) self.mkpath(dir)
for data in f[1]: for data in f[1]:
data = convert_path(f[1])
(out, _) = self.copy_file(data, dir) (out, _) = self.copy_file(data, dir)
self.outfiles.append(out) self.outfiles.append(out)