Merged revisions 68033 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68033 | tarek.ziade | 2008-12-29 23:23:53 +0100 (Mon, 29 Dec 2008) | 1 line

  fixed #4646 : distutils was choking on empty options arg in the setup function.
........
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index 8bcb88c..7903c2a 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -228,7 +228,7 @@
             # command options will override any supplied redundantly
             # through the general options dictionary.
             options = attrs.get('options')
-            if options:
+            if options is not None:
                 del attrs['options']
                 for (command, cmd_options) in options.items():
                     opt_dict = self.get_option_dict(command)