[Python-checkins] CVS: python/dist/src/Lib/distutils/command install.py,1.55,1.56

A.M. Kuchling akuchling@users.sourceforge.net
Tue, 16 Jan 2001 08:16:05 -0800


Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv8242

Modified Files:
	install.py 
Log Message:
Modified version of a patch from Jeremy Kloth, to make .get_outputs()
produce a list of unique filenames:
    "While attempting to build an RPM using distutils on Python 2.0,
    rpm complained about duplicate files.  The following patch fixed
    that problem.


Index: install.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/install.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** install.py	2000/12/20 00:48:12	1.55
--- install.py	2001/01/16 16:16:03	1.56
***************
*** 531,535 ****
          for cmd_name in self.get_sub_commands():
              cmd = self.get_finalized_command(cmd_name)
!             outputs.extend(cmd.get_outputs())
  
          return outputs
--- 531,539 ----
          for cmd_name in self.get_sub_commands():
              cmd = self.get_finalized_command(cmd_name)
!             # Add the contents of cmd.get_outputs(), ensuring
!             # that outputs doesn't contain duplicate entries
!             for filename in cmd.get_outputs():
!                 if filename not in outputs:
!                     outputs.append(filename)
  
          return outputs