[Python-checkins] python/dist/src/Lib/distutils/command bdist.py,1.25,1.26

[lemburg@users.sourceforge.net]

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

Modified Files:
	bdist.py 
Log Message:
Pulling Mark Alexander's contribution from CVS.



Index: bdist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** bdist.py	17 Apr 2002 20:30:10 -0000	1.25
--- bdist.py	4 Oct 2002 09:30:06 -0000	1.26
***************
*** 53,57 ****
  
      # The following commands do not take a format option from bdist
!     no_format_option = ('bdist_rpm', 'bdist_sdux', 'bdist_pkgtool')
  
      # This won't do in reality: will need to distinguish RPM-ish Linux,
--- 53,59 ----
  
      # The following commands do not take a format option from bdist
!     no_format_option = ('bdist_rpm',
!                         #'bdist_sdux', 'bdist_pkgtool'
!                         )
  
      # This won't do in reality: will need to distinguish RPM-ish Linux,
***************
*** 63,71 ****
      # Establish the preferred order (for the --help-formats option).
      format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
!                        'wininst', 'zip', 'pkgtool', 'sdux']
  
      # And the real information.
      format_command = { 'rpm':   ('bdist_rpm',  "RPM distribution"),
!                        'zip':   ('bdist_dumb', "ZIP file"),                       'gztar': ('bdist_dumb', "gzip'ed tar file"),
                         'bztar': ('bdist_dumb', "bzip2'ed tar file"),
                         'ztar':  ('bdist_dumb', "compressed tar file"),
--- 65,76 ----
      # Establish the preferred order (for the --help-formats option).
      format_commands = ['rpm', 'gztar', 'bztar', 'ztar', 'tar',
!                        'wininst', 'zip',
!                        #'pkgtool', 'sdux'
!                        ]
  
      # And the real information.
      format_command = { 'rpm':   ('bdist_rpm',  "RPM distribution"),
!                        'zip':   ('bdist_dumb', "ZIP file"),
!                        'gztar': ('bdist_dumb', "gzip'ed tar file"),
                         'bztar': ('bdist_dumb', "bzip2'ed tar file"),
                         'ztar':  ('bdist_dumb', "compressed tar file"),
***************
*** 74,80 ****
                                     "Windows executable installer"),
                         'zip':   ('bdist_dumb', "ZIP file"),
!                        'pkgtool': ('bdist_pkgtool', 
!                                    "Solaris pkgtool distribution"),
!                        'sdux':  ('bdist_sdux', "HP-UX swinstall depot"),
                        }
  
--- 79,85 ----
                                     "Windows executable installer"),
                         'zip':   ('bdist_dumb', "ZIP file"),
!                        #'pkgtool': ('bdist_pkgtool', 
!                        #            "Solaris pkgtool distribution"),
!                        #'sdux':  ('bdist_sdux', "HP-UX swinstall depot"),
                        }