[Python-checkins] distutils2: removed remaining bits from 'bdist_rpm'

[tarek.ziade]

tarek.ziade pushed 19f1965a304d to distutils2:

http://hg.python.org/distutils2/rev/19f1965a304d
changeset:   156:19f1965a304d
parent:      154:7eff59171017
user:        Yannick Gingras <ygingras at ygingras.net>
date:        Sat May 22 17:17:54 2010 -0400
summary:     removed remaining bits from 'bdist_rpm'
files:       src/distutils2/command/__init__.py, src/distutils2/command/bdist.py, src/distutils2/command/upload.py

diff --git a/src/distutils2/command/__init__.py b/src/distutils2/command/__init__.py
--- a/src/distutils2/command/__init__.py
+++ b/src/distutils2/command/__init__.py
@@ -20,7 +20,6 @@
            'register',
            'bdist',
            'bdist_dumb',
-           'bdist_rpm',
            'bdist_wininst',
            'upload',
            'check',
diff --git a/src/distutils2/command/bdist.py b/src/distutils2/command/bdist.py
--- a/src/distutils2/command/bdist.py
+++ b/src/distutils2/command/bdist.py
@@ -55,9 +55,6 @@
          "lists available distribution formats", show_formats),
         ]
 
-    # The following commands do not take a format option from bdist
-    no_format_option = ('bdist_rpm',)
-
     # This won't do in reality: will need to distinguish RPM-ish Linux,
     # Debian-ish Linux, Solaris, FreeBSD, ..., Windows, Mac OS.
     default_format = {'posix': 'gztar',
@@ -69,8 +66,7 @@
                        'wininst', 'zip', 'msi']
 
     # And the real information.
-    format_command = {'rpm':   ('bdist_rpm',  "RPM distribution"),
-                      'gztar': ('bdist_dumb', "gzip'ed tar file"),
+    format_command = {'gztar': ('bdist_dumb', "gzip'ed tar file"),
                       'bztar': ('bdist_dumb', "bzip2'ed tar file"),
                       'ztar':  ('bdist_dumb', "compressed tar file"),
                       'tar':   ('bdist_dumb', "tar file"),
diff --git a/src/distutils2/command/upload.py b/src/distutils2/command/upload.py
--- a/src/distutils2/command/upload.py
+++ b/src/distutils2/command/upload.py
@@ -96,11 +96,7 @@
         data['md5_digest'] = md5(content).hexdigest()
 
         comment = ''
-        if command == 'bdist_rpm':
-            dist, version, id = platform.dist()
-            if dist:
-                comment = 'built for %s %s' % (dist, version)
-        elif command == 'bdist_dumb':
+        if command == 'bdist_dumb':
             comment = 'built for %s' % platform.platform(terse=1)
         data['comment'] = comment
 

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