Rename 'formats' option to 'format', and remove the ability to generate

multiple built distributions in one run -- it seemed a bit dodgy and I'd
rather remove it than try to beat it into submission right now.

diff --git a/Lib/distutils/command/bdist.py b/Lib/distutils/command/bdist.py
index 12397fcac194024dba33ba50a8699fbe26fc0092..889cdba857bda95e3a35b00d4d2e9a4c11715e5a 100644 (file)
--- a/Lib/distutils/command/bdist.py
+++ b/Lib/distutils/command/bdist.py
@@ -10,14 +10,15 @@ __revision__ = "$Id$"
 import os, string
 from types import *
 from distutils.core import Command
+from distutils.errors import *
 
 
 class bdist (Command):
 
     description = "create a built (binary) distribution"
 
-    user_options = [('formats=', 'f',
-                     "formats for distribution (tar, ztar, gztar, zip, ... )"),
+    user_options = [('format=', 'f',
+                     "format for distribution (tar, ztar, gztar, zip, ... )"),
                    ]
 
     # This won't do in reality: will need to distinguish RPM-ish Linux,
@@ -32,21 +33,21 @@ class bdist (Command):
 
 
     def initialize_options (self):
-        self.formats = None
+        self.format = None
 
     # initialize_options()
 
 
     def finalize_options (self):
-        if self.formats is None:
+        if self.format is None:
             try:
-                self.formats = [self.default_format[os.name]]
+                self.format = self.default_format[os.name]
             except KeyError:
                 raise DistutilsPlatformError, \
                       "don't know how to create built distributions " + \
                       "on platform %s" % os.name
-        elif type (self.formats) is StringType:
-            self.formats = string.split (self.formats, ',')
+        #elif type (self.format) is StringType:
+        #    self.format = string.split (self.format, ',')
             
 
     # finalize_options()
@@ -54,19 +55,14 @@ class bdist (Command):
 
     def run (self):
 
-        for format in self.formats:
-            cmd_name = self.format_command[format]
-            sub_cmd = self.find_peer (cmd_name)
-            sub_cmd.set_option ('format', format)
-
-            # XXX blecchhh!! should formalize this: at least a
-            # 'forget_run()' (?)  method, possibly complicate the
-            # 'have_run' dictionary to include some command state as well
-            # as the command name -- eg. in this case we might want
-            # ('bdist_dumb','zip') to be marked "have run", but not
-            # ('bdist_dumb','gztar').
-            self.distribution.have_run[cmd_name] = 0
-            self.run_peer (cmd_name)
+        try:
+            cmd_name = self.format_command[self.format]
+        except KeyError:
+            raise DistutilsOptionError, \
+                  "invalid archive format '%s'" % self.format
+
+        sub_cmd = self.find_peer (cmd_name)
+        sub_cmd.set_option ('format', self.format)
 
     # run()