Expect a tuple (dest_name, copied) from 'copy_file()'.

diff --git a/Lib/distutils/command/install_data.py b/Lib/distutils/command/install_data.py
index 9ce118394b6b73a8098578d7feacdb50a737e0cd..d9a486936cfb03a7f1b145d7c6920e4b626f2558 100644 (file)
--- a/Lib/distutils/command/install_data.py
+++ b/Lib/distutils/command/install_data.py
@@ -52,7 +52,7 @@ class install_data (Command):
                     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)
+                (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
@@ -63,7 +63,7 @@ class install_data (Command):
                     dir = change_root(self.root, dir)
                 self.mkpath(dir)
                 for data in f[1]:
-                    out = self.copy_file(data, dir)
+                    (out, _) = self.copy_file(data, dir)
                     self.outfiles.append(out)
 
     def get_inputs (self):

diff --git a/Lib/distutils/command/install_headers.py b/Lib/distutils/command/install_headers.py
index ec0cf4412ddff6f6588272b0a48af85d10a13a5e..2d72a07b1467f30026822f0dc0d3ecb22ba9233f 100644 (file)
--- a/Lib/distutils/command/install_headers.py
+++ b/Lib/distutils/command/install_headers.py
@@ -41,7 +41,7 @@ class install_headers (Command):
 
         self.mkpath(self.install_dir)
         for header in headers:
-            out = self.copy_file(header, self.install_dir)
+            (out, _) = self.copy_file(header, self.install_dir)
             self.outfiles.append(out)
 
     def get_inputs (self):