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

gward · gward · commit e564278bfdf7 · 2000-09-30T17:34:50.000Z
diff --git a/Lib/distutils/command/install_data.py b/Lib/distutils/command/install_data.py
@@ -52,7 +52,7 @@ def run (self):
                     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 @@ def run (self):
                     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
@@ -41,7 +41,7 @@ def run (self):
 
         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):
