[Python-checkins] CVS: distutils/distutils/command install_data.py,1.14,1.15 install_headers.py,1.6,1.7
Greg Ward
python-dev@python.org
Sat, 30 Sep 2000 10:34:53 -0700
Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30240
Modified Files:
install_data.py install_headers.py
Log Message:
Expect a tuple (dest_name, copied) from 'copy_file()'.
Index: install_data.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install_data.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** install_data.py 2000/09/25 01:41:15 1.14
--- install_data.py 2000/09/30 17:34:50 1.15
***************
*** 53,57 ****
"'%s' -- installing right in '%s'" %
(f, self.install_dir))
! out = self.copy_file(f, self.install_dir)
self.outfiles.append(out)
else:
--- 53,57 ----
"'%s' -- installing right in '%s'" %
(f, self.install_dir))
! (out, _) = self.copy_file(f, self.install_dir)
self.outfiles.append(out)
else:
***************
*** 64,68 ****
self.mkpath(dir)
for data in f[1]:
! out = self.copy_file(data, dir)
self.outfiles.append(out)
--- 64,68 ----
self.mkpath(dir)
for data in f[1]:
! (out, _) = self.copy_file(data, dir)
self.outfiles.append(out)
Index: install_headers.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install_headers.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** install_headers.py 2000/09/25 01:41:15 1.6
--- install_headers.py 2000/09/30 17:34:50 1.7
***************
*** 42,46 ****
self.mkpath(self.install_dir)
for header in headers:
! out = self.copy_file(header, self.install_dir)
self.outfiles.append(out)
--- 42,46 ----
self.mkpath(self.install_dir)
for header in headers:
! (out, _) = self.copy_file(header, self.install_dir)
self.outfiles.append(out)