cloud-init-dev team mailing list archive

[Joshua Harlow <harlowja@xxxxxxxxx>]

Joshua Harlow has proposed merging lp:~harlowja/cloud-init/rpm-build-skip-not-tagged-versions into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/rpm-build-skip-not-tagged-versions/+merge/128302
-- 
https://code.launchpad.net/~harlowja/cloud-init/rpm-build-skip-not-tagged-versions/+merge/128302
Your team cloud init development team is requested to review the proposed merge of lp:~harlowja/cloud-init/rpm-build-skip-not-tagged-versions into lp:cloud-init.

=== modified file 'packages/brpm'
--- packages/brpm	2012-09-26 01:28:12 +0000
+++ packages/brpm	2012-10-05 18:34:21 +0000
@@ -58,8 +58,7 @@
             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']
@@ -127,13 +126,23 @@
     # 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)
-            changelog_lines.append(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!\n") % (line))
+            else:
+                changelog_lines.append(header)
         else:
             changelog_lines.append(line)
     subs['changelog'] = "\n".join(changelog_lines)