summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorharlowja <harlowja@virtualbox.rhel>2012-06-26 08:04:28 -0700
committerharlowja <harlowja@virtualbox.rhel>2012-06-26 08:04:28 -0700
commite657162aa2e0b3b4a92e4860f758ee85d8d85eba (patch)
tree32aba8985c94e87cb7508ce9900e6b1667d74125
parentd5935dddf11eb0381c6df4f72925fdab86839697 (diff)
downloadvyos-cloud-init-e657162aa2e0b3b4a92e4860f758ee85d8d85eba.tar.gz
vyos-cloud-init-e657162aa2e0b3b4a92e4860f758ee85d8d85eba.zip
1. Remove unused return arguments
2. Adjust info statement to reflect better what it is doing.
-rwxr-xr-xpackages/brpm8
1 files changed, 3 insertions, 5 deletions
diff --git a/packages/brpm b/packages/brpm
index b505e6b4..db60bf81 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -195,7 +195,7 @@ def generate_spec_contents(args, tmpl_fn, revno, version):
with open(tmpl_fn, 'r') as fh:
tmpl = tempita.Template(fh.read())
contents = tmpl.substitute(**subs)
- return (base_name, '%s.tar.gz' % (base_name), contents)
+ return contents
def archive_code():
@@ -231,10 +231,8 @@ def main():
# Form the spec file to be used
tmpl_fn = os.path.join(os.getcwd(), 'redhat', 'cloud-init.spec')
- info("Generated spec file from template %r" % (tmpl_fn))
- (base_name, arc_name, contents) = generate_spec_contents(args,
- tmpl_fn,
- revno, version)
+ info("Generating spec file from template %r" % (tmpl_fn))
+ contents = generate_spec_contents(args, tmpl_fn, revno, version)
spec_fn = os.path.join(root_dir, 'cloud-init.spec')
with open(spec_fn, 'w') as fh:
fh.write(contents)