openstack
/
pbr
Code Issues Proposed changes

Merge "Don't pass empty 'long_description'"

This commit is contained in:
Zuul 2021-04-22 12:11:51 +00:00 committed by Gerrit Code Review
parent c4ea653db4 16a8553e9f
commit 5c4dae09ed
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pbr/util.py
View File

@ -321,28 +321,26 @@ def setup_cfg_to_setup_kwargs(config, script_args=()):
section, option = alias
elif len(alias) == 1:
# The distutils field name is the same thant distutils2's.
# The distutils field name is the same as distutils2's.
section = alias[0]
option = arg
in_cfg_value = has_get_option(config, section, option)
if not in_cfg_value and arg == "long_description":
in_cfg_value = has_get_option(config, section, "description_file")
if in_cfg_value:
in_cfg_value = split_multiline(in_cfg_value)
value = ''
for filename in in_cfg_value:
description_file = io.open(filename, encoding='utf-8')
try:
value += description_file.read().strip() + '\n\n'
finally:
description_file.close()
in_cfg_value = value
if not in_cfg_value:
# There is no such option in the setup.cfg
if arg == "long_description":
in_cfg_value = has_get_option(config, section,
"description_file")
if in_cfg_value:
in_cfg_value = split_multiline(in_cfg_value)
value = ''
for filename in in_cfg_value:
description_file = io.open(filename, encoding='utf-8')
try:
value += description_file.read().strip() + '\n\n'
finally:
description_file.close()
in_cfg_value = value
else:
continue
continue
if arg in CSV_FIELDS:
in_cfg_value = split_csv(in_cfg_value)