[debhelper-devel] [debhelper] 08/15: dh_clean: Use new glob_expand-enabled filearray

Niels Thykier nthykier at moszumanska.debian.org
Wed Jun 28 13:47:48 UTC 2017


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

nthykier pushed a commit to branch glob-refactor
in repository debhelper.

commit 5fc56713c94a62c7aa959b9f64336366fa543f86
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jun 27 16:29:45 2017 +0000

    dh_clean: Use new glob_expand-enabled filearray
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_clean | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dh_clean b/dh_clean
index f50be30..5135250 100755
--- a/dh_clean
+++ b/dh_clean
@@ -132,8 +132,11 @@ if (! $dh{D_FLAG}) {
 
 	if (! $dh{K_FLAG}) {
 		if (!compat(6) && -e "debian/clean") {
-			my @clean=grep { ! excludefile($_) }
-			filearray("debian/clean", ".");
+			my @clean=grep {
+				! excludefile($_)
+			# Silently ignore missing files - for all we know, dh_clean is run before
+			# they have been created.
+			} filearray('debian/clean', ["."], \&glob_expand_error_handler_silently_ignore);
 			push(@clean_files, grep { !m@/$@ } @clean);
 			push(@clean_dirs, grep { m@/$@ } @clean);
 		}

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




More information about the debhelper-devel mailing list