summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-06-25 21:33:36 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2012-06-25 21:33:36 -0700
commiteb9d93b3403b6289c1f5278eea8886fb7415a651 (patch)
tree101b4b6cdd5dfbb292746bd1ad0a25ad5d950530 /packages
parent0b692aa1f4cd99332e47fca7a8cc27843ad1bbe5 (diff)
downloadvyos-cloud-init-eb9d93b3403b6289c1f5278eea8886fb7415a651.tar.gz
vyos-cloud-init-eb9d93b3403b6289c1f5278eea8886fb7415a651.zip
Output the base tar name
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/brpm5
-rwxr-xr-xpackages/tar-me1
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/brpm b/packages/brpm
index febbfb5e..c3be5997 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -90,7 +90,7 @@ def generate_spec_contents(tmpl_fn, revno, version):
(stdout, _stderr) = tiny_p([sys.executable,
join(os.getcwd(), 'rpm-changelog')])
- subs['changelog'] = stdout
+ subs['changelog'] = stdout.strip()
# See: http://www.zarb.org/~jasonc/macros.php
# Pickup any special files
@@ -127,7 +127,8 @@ def archive_code():
lines = stdout.splitlines()
revno = lines[0]
version = lines[1]
- arc_fn = lines[2]
+ bname = lines[2]
+ arc_fn = lines[3]
return (revno, version, arc_fn)
diff --git a/packages/tar-me b/packages/tar-me
index 261b77bb..14b59960 100755
--- a/packages/tar-me
+++ b/packages/tar-me
@@ -80,6 +80,7 @@ def main(args):
print revno
print version
+ print bfn
print(os.path.abspath(fn))
return 0