diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2008-12-29 22:38:38 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2008-12-29 22:38:38 (GMT) |
| commit | 4450dcf041523fa6752be97994a4111a803dd1fc (patch) | |
| tree | 06b0c40c8f7c7df3fd77206299b3ce48e09b7fad /Lib/distutils/dist.py | |
| parent | 0fa3f3d663ae4c8d79abc20681d072a1015cd2f7 (diff) | |
| download | cpython-4450dcf041523fa6752be97994a4111a803dd1fc.zip cpython-4450dcf041523fa6752be97994a4111a803dd1fc.tar.gz cpython-4450dcf041523fa6752be97994a4111a803dd1fc.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/distutils/dist.py')
| -rw-r--r-- | Lib/distutils/dist.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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) |