[Python-checkins] CVS: distutils/distutils/command install_data.py,1.9,1.10

2000年6月24日 10:36:26 -0700

Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv732
Modified Files:
	install_data.py 
Log Message:
Print a warning if we install a data file right in install_dir.
Tweaked help text.
Index: install_data.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install_data.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** install_data.py	2000年06月21日 03:12:07	1.9
--- install_data.py	2000年06月24日 17:36:24	1.10
***************
*** 19,23 ****
 user_options = [
 ('install-dir=', 'd',
! "directory to install the files to"),
 ('root=', None,
 "install everything relative to this alternate root directory"),
--- 19,24 ----
 user_options = [
 ('install-dir=', 'd',
! "base directory for installating data files "
! "(default: installation base dir)"),
 ('root=', None,
 "install everything relative to this alternate root directory"),
***************
*** 40,48 ****
 for f in self.data_files:
 if type(f) == StringType:
! # its a simple file, so copy it
 out = self.copy_file(f, self.install_dir)
 self.outfiles.append(out)
 else:
! # its a tuple with path to install to and a list of files
 dir = f[0]
 if not os.path.isabs(dir):
--- 41,52 ----
 for f in self.data_files:
 if type(f) == StringType:
! # it's a simple file, so copy it
! self.warn("setup script did not provide a directory for "
! "'%s' -- installing right in '%s'" %
! (f, self.install_dir))
 out = self.copy_file(f, self.install_dir)
 self.outfiles.append(out)
 else:
! # it's a tuple with path to install to and a list of files
 dir = f[0]
 if not os.path.isabs(dir):