[debhelper-devel] [debhelper] 03/03: Dh_Lib: Make pkgfile ignore .debhelper files

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 2ad3d2d3b98b092af532aa780ca1536baf591f48
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jul 15 16:58:15 2017 +0000

    Dh_Lib: Make pkgfile ignore .debhelper files
    
    When we generate a maintscript, it ends up as
    debian/<pkg>.<script>.debhelper.  This means that pkgfile(<pkg>,
    <script>) will now trigger the "expensive" case for architecture
    dependent scripts for any generated script.
    
    This patch special cases the ".debhelper" extension and thereby avoid
    this overhead.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 93cc800..95b8f13 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -661,7 +661,9 @@ sub tmpdir {
 		my (@try, $check_expensive);
 
 		if (not exists($_check_expensive{$filename})) {
-			my @f = bsd_glob("debian/*.$filename.*", GLOB_CSH & ~(GLOB_NOMAGIC|GLOB_TILDE));
+			my @f = grep {
+				!/\.debhelper$/
+			} bsd_glob("debian/*.$filename.*", GLOB_CSH & ~(GLOB_NOMAGIC|GLOB_TILDE));
 			if (not @f) {
 				$check_expensive = 0;
 			} else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git