From 130d90cc675db6f33d294bf04e9c74227c07db50 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 5 Oct 2012 11:22:31 -0700 Subject: Leave off creating fake headers for unknown versions since this causes rpmbuild to croak with errors like 'changelog not in descending chronological order'. --- packages/brpm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/brpm b/packages/brpm index 1735f5bb..5aecad65 100755 --- a/packages/brpm +++ b/packages/brpm @@ -58,8 +58,7 @@ def get_log_header(version): a_rev = rev break if not a_rev: - return format_change_line(datetime.now(), - '??', version) + return None # Extract who made that tag as the header cmd = ['bzr', 'log', '-r%s' % (a_rev), '--timezone=utc'] @@ -133,7 +132,8 @@ def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn): if re.match(r"^\s*[\d][.][\d][.][\d]:\s*", line): line = line.strip(":") header = get_log_header(line) - changelog_lines.append(header) + if header: + changelog_lines.append(header) else: changelog_lines.append(line) subs['changelog'] = "\n".join(changelog_lines) -- cgit v1.2.3 From 6cfb1d869614e8ceee45c4443ec65603cce72b78 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 5 Oct 2012 11:30:36 -0700 Subject: Only allow the first missing version to use the datetime.now(), the others get a warning message. --- packages/brpm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/brpm b/packages/brpm index 5aecad65..28136d74 100755 --- a/packages/brpm +++ b/packages/brpm @@ -126,13 +126,22 @@ def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn): # Format a nice changelog (as best as we can) changelog = util.load_file(util.abs_join(find_root(), 'ChangeLog')) changelog_lines = [] + missing_versions = 0 for line in changelog.splitlines(): if not line.strip(): continue if re.match(r"^\s*[\d][.][\d][.][\d]:\s*", line): line = line.strip(":") header = get_log_header(line) - if header: + if not header: + missing_versions += 1 + if missing_versions == 1: + # Must be using a new 'dev'/'trunk' release + changelog_lines.append(format_change_line(datetime.now(), '??')) + else: + sys.stderr.write(("Changelog version line %s " + "does not have a corresponding tag!") % (line)) + else: changelog_lines.append(header) else: changelog_lines.append(line) -- cgit v1.2.3 From 7a2e678685dbc94e13f6d8ca6a5e92000e1f974f Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Fri, 5 Oct 2012 11:31:56 -0700 Subject: Ensure stderr newline. --- packages/brpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/brpm b/packages/brpm index 28136d74..7975e05c 100755 --- a/packages/brpm +++ b/packages/brpm @@ -140,7 +140,7 @@ def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn): changelog_lines.append(format_change_line(datetime.now(), '??')) else: sys.stderr.write(("Changelog version line %s " - "does not have a corresponding tag!") % (line)) + "does not have a corresponding tag!\n") % (line)) else: changelog_lines.append(header) else: -- cgit v1.2.3