x/cloud-init
Code Issues Proposed changes

Make the subrelease a new k/v entry that is handled

Browse Source 
differently in the rpm spec file template instead
of being joined with the release.
This commit is contained in:
Joshua Harlow 2012-10-08 16:33:43 -07:00
parent 317252d74a
commit 83b6aa7c97
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/brpm
View File

@ -107,7 +107,9 @@ def generate_spec_contents(args, tmpl_fn, top_dir, arc_fn):
subs['revno'] = revno subs['revno'] = revno
subs['release'] = "bzr%s" % (revno) subs['release'] = "bzr%s" % (revno)
if args.sub_release is not None: if args.sub_release is not None:
subs['release'] += ".%s" % (args.sub_release) subs['subrelease'] = "." + str(args.sub_release)
else:
subs['subrelease'] = ''
subs['archive_name'] = arc_fn subs['archive_name'] = arc_fn
cmd = [util.abs_join(find_root(), 'tools', 'read-dependencies')] cmd = [util.abs_join(find_root(), 'tools', 'read-dependencies')]

2
packages/redhat/cloud-init.spec.in
View File

@ -11,7 +11,7 @@
Name: cloud-init Name: cloud-init
Version: ${version} Version: ${version}
Release: ${release}%{?dist} Release: ${release}${subrelease}%{?dist}
Summary: Cloud instance init scripts Summary: Cloud instance init scripts
Group: System Environment/Base Group: System Environment/Base