openstack
/
release-tools
Code Issues Proposed changes

skip reno when release-notes is only getting a list of changes 

If all we want is the list of changes, such as when called from
list_unreleased_changes.sh, then do not try to scan with reno. The scan
will fail anyway, because HEAD isn't a tag and reno rejects it.

Change-Id: I681ac8612758c0cd2a3abb62b11c36191c83861c
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2017-01-17 14:24:31 -05:00
parent a9a78826b2
commit d818b491ce
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
releasetools/release_notes.py
View File

@ -344,25 +344,28 @@ def generate_release_notes(library, library_path,
change_header.append("-" * len(change_header[0]))
# Look for reno notes for this version.
cfg = reno_config.Config(
reporoot=library_path,
)
branch = None
if is_stable and series:
branch = 'origin/stable/%s' % series
cfg.override(branch=branch)
ldr = loader.Loader(conf=cfg)
if end_revision in ldr.versions:
rst_notes = formatter.format_report(
ldr,
versions_to_include=[end_revision],
if not changes_only:
cfg = reno_config.Config(
reporoot=library_path,
)
reno_notes = rst2txt.convert(rst_notes).decode('utf-8')
branch = None
if is_stable and series:
branch = 'origin/stable/%s' % series
cfg.override(branch=branch)
ldr = loader.Loader(conf=cfg)
if end_revision in ldr.versions:
rst_notes = formatter.format_report(
ldr,
versions_to_include=[end_revision],
)
reno_notes = rst2txt.convert(rst_notes).decode('utf-8')
else:
sys.stderr.write(
'WARNING: Did not find revision %r in %r, skipping reno\n' %
(end_revision, ldr.versions)
)
reno_notes = ''
else:
sys.stderr.write(
'WARNING: Did not find revision %r in %r, skipping reno' %
(end_revision, ldr.versions)
)
reno_notes = ''
# The recipient for announcements should always be the