summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-10-05 11:22:31 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-10-05 11:22:31 -0700
commit130d90cc675db6f33d294bf04e9c74227c07db50 (patch)
tree9e9d23cae957058cde62a4841082a5377af64433 /packages
parentf73abb10210e21da858b99238e2945e5bf1cfac2 (diff)
downloadvyos-cloud-init-130d90cc675db6f33d294bf04e9c74227c07db50.tar.gz
vyos-cloud-init-130d90cc675db6f33d294bf04e9c74227c07db50.zip
Leave off creating fake headers for unknown versions
since this causes rpmbuild to croak with errors like 'changelog not in descending chronological order'.
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/brpm6
1 files 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)