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.
........
This commit is contained in:
Tarek Ziadé 2008-12-29 22:38:38 +00:00
parent 0fa3f3d663
commit 4450dcf041
3 changed files with 28 additions and 1 deletions

View file

@ -228,7 +228,7 @@ Common commands: (see '--help-commands' for more)
# 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)