[Python-checkins] distutils2: merged Yannick work

[tarek.ziade]

tarek.ziade pushed ddb6eda2abd7 to distutils2:

http://hg.python.org/distutils2/rev/ddb6eda2abd7
changeset:   159:ddb6eda2abd7
tag:         tip
parent:      155:105229c23a6a
parent:      158:4310eca1971e
user:        Tarek Ziade <tarek at ziade.org>
date:        Sat May 22 23:39:02 2010 +0200
summary:     merged Yannick work
files:       

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"),
@@ -131,8 +127,6 @@
         for i in range(len(self.formats)):
             cmd_name = commands[i]
             sub_cmd = self.reinitialize_command(cmd_name)
-            if cmd_name not in self.no_format_option:
-                sub_cmd.format = self.formats[i]
 
             # passing the owner and group names for tar archiving
             if cmd_name == 'bdist_dumb':
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
 
diff --git a/src/distutils2/tests/test_bdist.py b/src/distutils2/tests/test_bdist.py
--- a/src/distutils2/tests/test_bdist.py
+++ b/src/distutils2/tests/test_bdist.py
@@ -31,8 +31,7 @@
         # XXX an explicit list in bdist is
         # not the best way to  bdist_* commands
         # we should add a registry
-        formats = ['rpm', 'zip', 'gztar', 'bztar', 'ztar',
-                   'tar', 'wininst', 'msi']
+        formats = ['zip', 'gztar', 'bztar', 'ztar', 'tar', 'wininst', 'msi']
         formats.sort()
         founded = cmd.format_command.keys()
         founded.sort()

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