From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Fri, 24 Feb 2012 12:38:13 +0000 (+0200)
Subject: Make sure that for per-version src tarballs, VCS dirs are really excluded.
X-Git-Tag: 0.1~915^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a348106f03104630fc2cd3e136eaaf32a30bc0a4;p=fdroidserver.git

Make sure that for per-version src tarballs, VCS dirs are really excluded.

A full path is passed to the filter function, so old code didn't really work.
---

diff --git a/build.py b/build.py
index f851da1c..9d6abd8f 100755
--- a/build.py
+++ b/build.py
@@ -139,8 +139,9 @@ def build_local(app, thisbuild, build_dir, output_dir):
     tarball = tarfile.open(os.path.join(tmp_dir,
         tarname + '.tar.gz'), "w:gz")
     def tarexc(f):
-        if f in ['.svn', '.git', '.hg', '.bzr']:
-            return True
+        for vcs_dir in ['.svn', '.git', '.hg', '.bzr']:
+            if f.endswith(vcs_dir):
+                return True
         return False
     tarball.add(build_dir, tarname, exclude=tarexc)
     tarball.close()