summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-21 23:01:35 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-21 23:15:00 +0200
commit515e82602216fc40a224f02f34d0a0f0c03c8309 (patch)
tree4ebd6c1f299ddb742f848607a0d5e2cd91dc7ecb
parent10eca9f5bef1821de09601a3a7db7eb337c56ba0 (diff)
gentree.py: do not add full path into tar
dir_to_tar could be the absolute path to the directory to to tar, but we do not want the full patch in the tar, just the basename. In addition the second close is not necessary. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rwxr-xr-xgentree.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/gentree.py b/gentree.py
index 42cf37d2..daf90330 100755
--- a/gentree.py
+++ b/gentree.py
@@ -363,9 +363,9 @@ def create_tar_and_bz2(tar_name, dir_to_tar):
in the backend decompresses and verifies the tarball against
our signature.
"""
- parent = os.path.dirname(tar_name)
+ basename = os.path.basename(dir_to_tar)
tar = tarfile.open(tar_name, "w")
- tar.add(dir_to_tar)
+ tar.add(dir_to_tar, basename)
tar.close()
tar_file = open(tar_name, "r")
@@ -374,8 +374,6 @@ def create_tar_and_bz2(tar_name, dir_to_tar):
bz2_file.write(tar_file.read())
bz2_file.close()
- tar.close()
-
def upload_release(args, rel_prep, logwrite=lambda x:None):
"""
Given a path of a relase make tarball out of it, PGP sign it, and