Merge branch 'stable-3.x'

[ypp-sc-tools.main.git] / yarrg / web / source.tar.gz

diff --git a/yarrg/web/source.tar.gz b/yarrg/web/source.tar.gz
index 8825da4a500f6b974e2614f78ce2a05d35dc3ddf..1d92ad8584255028578f7b1cbb2da41f9376f5f5 100755 (executable)
--- a/yarrg/web/source.tar.gz
+++ b/yarrg/web/source.tar.gz
@@ -42,7 +42,7 @@ use CommodsWeb;
 $r->content_type('application/octet-stream');
 $m->flush_buffer();
 
-$ENV{'YPPSC_YARRG_SRCBASE'}= $sourcebasedir;
+$ENV{'YPPSC_YARRG_SRCBASE'}= sourcebasedir();
 my $pipe= new IO::Pipe or die $!;
 my $pid= fork();  defined $pid or die $!;
 if (!$pid) {
@@ -53,7 +53,10 @@ if (!$pid) {
                 git-ls-files -z;
                 git-ls-files -z --others --exclude-from=.gitignore;
                 if test -d .git; then find .git -print0; fi
-               ) | cpio -Hustar -o --quiet -0 -R 1000:1000 | gzip
+               ) | (
+                cpio -Hustar -o --quiet -0 -R 1000:1000 || \
+                cpio -Hustar -o --quiet -0
+               ) | gzip
        ';
        die $!;
 }