| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From cb3e98e17a666896150b109694e9eb9278620845 Mon Sep 17 00:00:00 2001 |
| 2 | From: Niko Tyni <ntyni@debian.org> |
| 3 | Date: Sat, 17 May 2014 14:57:01 +0300 |
| 4 | Subject: Skip a regeneration check in unrelated git repositories |
| 5 | |
| 6 | If the test is run in a git repository without lib/.gitignore, |
| 7 | for instance because the repository only imported the Perl tarball, |
| 8 | the regeneration check is broken because lib/.gitignore is missing. |
| 9 | |
| 10 | Patch-Name: debian/regen-skip.diff |
| 11 | --- |
| 12 | regen/lib_cleanup.pl | 2 +- |
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/regen/lib_cleanup.pl b/regen/lib_cleanup.pl |
| 16 | index c9d6e43..fece1ed 100644 |
| 17 | --- a/regen/lib_cleanup.pl |
| 18 | +++ b/regen/lib_cleanup.pl |
| 19 | @@ -159,7 +159,7 @@ foreach ('win32/Makefile', 'win32/makefile.mk') { |
| 20 | } |
| 21 | |
| 22 | # This must come last as it can exit early: |
| 23 | -if ($TAP && !-d '.git' && !-f 'lib/.gitignore') { |
| 24 | +if ($TAP && !-d '.git' || !-f 'lib/.gitignore') { |
| 25 | print "ok # skip not being run from a git checkout, hence no lib/.gitignore\n"; |
| 26 | exit 0; |
| 27 | } |