From 7d4f23e73f377606db49e3ceda4e2ece370fa679 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Sat, 9 Feb 2019 10:44:22 +0000
Subject: filedoublearray: Strip whitespace and detect whitespace-only lines

Signed-off-by: Niels Thykier <niels@thykier.net>
---
 lib/Debian/Debhelper/Dh_Lib.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index 482e758e..f78f3248 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -1387,9 +1387,17 @@ sub filedoublearray {
 	my @ret;
 	while (<DH_FARRAY_IN>) {
 		chomp;
-		if (not $x)  {
-			next if /^#/ || /^$/;
+		if ($x) {
+			if (m/^\s++$/) {
+				error("Executable config file $file produced a non-empty whitespace-only line");
+			}
+		} else {
+			s/^\s++//;
+			next if /^#/;
+			s/\s++$//;
 		}
+		# We always ignore/permit empty lines
+		next if $_ eq '';
 		my @line;
 
 		if (defined($globdir) && ! $x) {
-- 
cgit v1.2.3