|
 |
f085be |
From 3f37f7b8b0d99b274e2eadc4eff232ea670cb6fd Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
|
f085be |
Date: Wed, 6 Aug 2014 20:11:00 +0200
|
|
|
f085be |
Subject: [PATCH 084/137] fdo#82137 don't include working directory in tarballs
|
|
|
f085be |
|
|
|
f085be |
as this changes permissions when extracting, and those are restrictive,
|
|
|
f085be |
since it is a temporary directory
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I41b28fe405e5915faeea944eb3cfdbed518ac55d
|
|
|
f085be |
(cherry picked from commit 5ca2b6fca9eb975886f6796e6086ddf79be387d5)
|
|
|
f085be |
---
|
|
|
f085be |
bin/lo-pack-sources | 4 ++--
|
|
|
f085be |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
|
|
|
f085be |
index de6a4be..3571638 100755
|
|
|
f085be |
--- a/bin/lo-pack-sources
|
|
|
f085be |
+++ b/bin/lo-pack-sources
|
|
|
f085be |
@@ -13,6 +13,7 @@ my %module_dirname = (
|
|
|
f085be |
"help" => "helpcontent2",
|
|
|
f085be |
"translations" => "translations"
|
|
|
f085be |
);
|
|
|
f085be |
+my $lo_topdir_name;
|
|
|
f085be |
|
|
|
f085be |
# get libreoffice-build version from the given libreoffice-build sources
|
|
|
f085be |
sub get_config_version($)
|
|
|
f085be |
@@ -159,7 +160,7 @@ sub generate_tarball($$$)
|
|
|
f085be |
|
|
|
f085be |
print "Creating $tarball...";
|
|
|
f085be |
# generate the tarball in the current directory; avoid "./" prefix in the stored paths; show progress
|
|
|
f085be |
- system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 --checkpoint-action=exec=\"echo -n .\" --transform=\"s|^\./||\" .") &&
|
|
|
f085be |
+ system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 --checkpoint-action=exec=\"echo -n .\" $lo_topdir_name") &&
|
|
|
f085be |
die "Error: releasing failed: $!\n";
|
|
|
f085be |
print "\n";
|
|
|
f085be |
}
|
|
|
f085be |
@@ -351,7 +352,6 @@ my $state_release_version;
|
|
|
f085be |
my $lo_core_tempdir;
|
|
|
f085be |
my $force;
|
|
|
f085be |
my $verbose=1;
|
|
|
f085be |
-my $lo_topdir_name;
|
|
|
f085be |
my %module_tarball_name;
|
|
|
f085be |
|
|
|
f085be |
###################
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|