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