diff options
| author | Erik Bray <embray@stsci.edu> | 2012-02-20 23:24:49 +0000 |
|---|---|---|
| committer | Erik Bray <embray@stsci.edu> | 2012-02-20 23:24:49 +0000 |
| commit | 080f59d9dd4870aff01bcfdada98a80ec58544b8 (patch) | |
| tree | ee17fec7f775a87190f2a81311365b5b44ad3afb | |
| parent | f6fe1e026ea1c9750244662fb6e248bca3598f33 (diff) | |
| download | pbr-080f59d9dd4870aff01bcfdada98a80ec58544b8.tar.gz | |
Fixes a bug where entry_points in a setup.py are blanked out if there are no entry points defined in setup.cfg.
git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15185 fe389314-cf27-0410-b35b-8c050e845b92
| -rw-r--r-- | pbr/d2to1/util.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pbr/d2to1/util.py b/pbr/d2to1/util.py index 78e8453..0abe1ba 100644 --- a/pbr/d2to1/util.py +++ b/pbr/d2to1/util.py @@ -233,8 +233,13 @@ def cfg_to_args(path='setup.cfg'): kwargs[arg] = in_cfg_value - kwargs['ext_modules'] = get_extension_modules(config) - kwargs['entry_points'] = get_entry_points(config) + ext_modules = get_extension_modules(config) + if ext_modules: + kwargs['ext_modules'] = ext_modules + + entry_points = get_entry_points(config) + if entry_points: + kwargs['entry_points'] = entry_points wrap_commands(kwargs) return kwargs |