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-28 22:20:17 +0100
commitb74016dd555e6ec73b75049eaf2d7f77e7d2e0a6 (patch)
treed9902b651c8a2383eb1eea261403a0457fca1df3
parente23b4d0365062d26ce9102d93d0e5f40fb6658a6 (diff)
gentree.py: do not add full path into tar
Upstream commit: 515e82602216fc40a224f02f34d0a0f0c03c8309 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