diff options
| author | Richard Laager <rlaager@wiktel.com> | 2020-02-09 21:54:21 -0600 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-10 22:53:42 +0200 |
| commit | 5118cf914df8c48b5999ce0cae80b43c4cd56632 (patch) | |
| tree | f89aaf6fb9db5d38cdf4ccaddaa18920552af1da | |
| parent | 93b9a3ed2952cd741f298d70dad74f87fe4688d1 (diff) | |
| download | meson-5118cf914df8c48b5999ce0cae80b43c4cd56632.zip meson-5118cf914df8c48b5999ce0cae80b43c4cd56632.tar.gz meson-5118cf914df8c48b5999ce0cae80b43c4cd56632.tar.bz2 | |
Exclude .hg* from dist tarballs
Debian's lintian checker complaints when upstream tarballs contain an
.hgtags file.
This excludes ".hg[a-z]*". This is mostly consistent with the git
handling in del_gitfiles() which deletes .git*. hg archive --help shows
an example of -X ".hg*". However, instead of ".hg*", I have used
".hg[a-z]*" to keep the automatically added hg_archival.txt. This file
may be useful to link the tarball to the Mercurial revision for either
manual inspection or in case any code interprets it for a --version or
similar.
This also excludes .hgignore and other things like .hgflow, which seems
desirable.
Fixes #6575
| -rw-r--r-- | mesonbuild/mdist.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/mdist.py b/mesonbuild/mdist.py index a86cd43..ef722ea 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -151,7 +151,16 @@ def create_dist_hg(dist_name, archives, src_root, bld_root, dist_sub, dist_scrip xzname = tarname + '.xz' gzname = tarname + '.gz' zipname = os.path.join(dist_sub, dist_name + '.zip') - subprocess.check_call(['hg', 'archive', '-R', src_root, '-S', '-t', 'tar', tarname]) + # Note that -X interprets relative paths using the current working + # directory, not the repository root, so this must be an absolute path: + # https://bz.mercurial-scm.org/show_bug.cgi?id=6267 + # + # .hg[a-z]* is used instead of .hg* to keep .hg_archival.txt, which may + # be useful to link the tarball to the Mercurial revision for either + # manual inspection or in case any code interprets it for a --version or + # similar. + subprocess.check_call(['hg', 'archive', '-R', src_root, '-S', '-t', 'tar', + '-X', src_root + '/.hg[a-z]*', tarname]) output_names = [] if 'xztar' in archives: import lzma |