[Python-checkins] distutils2: Correct bug : DATAFILES not added in RECORD file.

[tarek.ziade]

tarek.ziade pushed 08024169e638 to distutils2:

http://hg.python.org/distutils2/rev/08024169e638
changeset:   1052:08024169e638
user:        FELD Boris <lothiraldan at gmail.com>
date:        Sat Jan 29 17:32:29 2011 +0100
summary:
  Correct bug : DATAFILES not added in RECORD file.

files:
  distutils2/command/install_distinfo.py

diff --git a/distutils2/command/install_distinfo.py b/distutils2/command/install_distinfo.py
--- a/distutils2/command/install_distinfo.py
+++ b/distutils2/command/install_distinfo.py
@@ -69,6 +69,9 @@
             self.requested = True
         if self.no_record is None:
             self.no_record = False
+        if self.no_datafiles is None:
+            self.no_datafiles = False
+
 
         metadata = self.distribution.metadata
 
@@ -116,6 +119,24 @@
                 f.close()
                 self.outputs.append(requested_path)
 
+
+            if not self.no_datafiles:
+                datafiles_path = os.path.join(self.distinfo_dir, 'DATAFILES')
+                logger.info('creating %s', datafiles_path)
+                f = open(datafiles_path, 'wb')
+                try:
+                    writer = csv.writer(f, delimiter=',',
+                                        lineterminator=os.linesep,
+                                        quotechar='"')
+                    install_data = self.get_finalized_command('install_data')
+                    if install_data.get_datafiles_out() != '':
+                        for tuple in install_data.get_datafiles_out():
+                            writer.writerow(tuple)
+
+                    self.outputs.append(datafiles_path)
+                finally:
+                    f.close()
+
             if not self.no_record:
                 record_path = os.path.join(self.distinfo_dir, 'RECORD')
                 logger.info('creating %s', record_path)
@@ -145,21 +166,6 @@
                 finally:
                     f.close()
 
-            if not self.no_datafiles:
-                datafiles_path = os.path.join(self.distinfo_dir, 'DATAFILES')
-                logger.info('creating %s', datafiles_path)
-                f = open(datafiles_path, 'wb')
-                try:
-                    writer = csv.writer(f, delimiter=',',
-                                        lineterminator=os.linesep,
-                                        quotechar='"')
-                    install_data = self.get_finalized_command('install_data')
-                    if install_data.get_datafiles_out() != '':
-                        for tuple in install_data.get_datafiles_out():
-                            writer.writerow(tuple)
-                finally:
-                    f.close()
-
 
     def get_outputs(self):
         return self.outputs

--
Repository URL: http://hg.python.org/distutils2