[Python-checkins] distutils2: Only create DATAFILES if distribution include data files.

tarek.ziade python-checkins at python.org
Wed Feb 16 22:23:57 CET 2011


tarek.ziade pushed 76c733a49022 to distutils2:

http://hg.python.org/distutils2/rev/76c733a49022
changeset:   1053:76c733a49022
user:        FELD Boris <lothiraldan at gmail.com>
date:        Sat Jan 29 17:42:22 2011 +0100
summary:
  Only create DATAFILES if distribution include data files.

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
@@ -121,21 +121,21 @@
 
 
             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() != '':
+                install_data = self.get_finalized_command('install_data')
+                if install_data.get_datafiles_out() != []:
+                    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='"')
                         for tuple in install_data.get_datafiles_out():
                             writer.writerow(tuple)
 
-                    self.outputs.append(datafiles_path)
-                finally:
-                    f.close()
+                        self.outputs.append(datafiles_path)
+                    finally:
+                        f.close()
 
             if not self.no_record:
                 record_path = os.path.join(self.distinfo_dir, 'RECORD')

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


More information about the Python-checkins mailing list