From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 17 May 2018 06:13:21 +0000 (+0200)
Subject: check_tree.pl : Do not skip mask info with useless hunks.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5552feb7cd5f6290b4c0739edce06af021d6f9a9;p=elogind.git

check_tree.pl : Do not skip mask info with useless hunks.
---

diff --git a/pwx/check_tree.pl b/pwx/check_tree.pl
index 35173aeb3..c293d6c9d 100755
--- a/pwx/check_tree.pl
+++ b/pwx/check_tree.pl
@@ -478,21 +478,22 @@ sub build_output {
 		$in_mask_block = $hHunk->{is_mask} && (!$hHunk->{is_endif}) ? 1 : 0;
 		$in_else_block = $hHunk->{is_else} && (!$hHunk->{is_endif}) ? 1 : 0;
 
-		# The useless are to be skipped
-		$hHunk->{useful} or next;
+		# The useless are to be skipped, but we need the [e]logind[m]ask[i]nfo
+		if ($hHunk->{useful}) {
 
-		# --- Add a comment line for later processing of .pwx files
-		$hFile{pwxfile} and push(@{$hFile{output}}, "# emi ${in_mask_block} ${in_else_block}");
+			# --- Add the header line -----------------
+			# -----------------------------------------
+			push(@{$hFile{output}}, get_hunk_head(\$offset));
 
-		# --- Add the header line -----------------
-		# -----------------------------------------
-		push(@{$hFile{output}}, get_hunk_head(\$offset));
-
-		# --- Add the hunk lines ------------------
-		# -----------------------------------------
-		for my $line (@{$hHunk->{lines}}) {
-			push(@{$hFile{output}}, $line);
+			# --- Add the hunk lines ------------------
+			# -----------------------------------------
+			for my $line (@{$hHunk->{lines}}) {
+				push(@{$hFile{output}}, $line);
+			}
 		}
+
+		# --- Add a comment line for later processing of .pwx files
+		$hFile{pwxfile} and push(@{$hFile{output}}, "# emi ${in_mask_block} ${in_else_block}");
 	} ## End of walking the hunks
 
 	return 1;
diff --git a/pwx/last_mutual_commits.csv b/pwx/last_mutual_commits.csv
index c671aac23..24a922669 100644
--- a/pwx/last_mutual_commits.csv
+++ b/pwx/last_mutual_commits.csv
@@ -11,4 +11,4 @@
 ../systemd-upstream master      265710c20 src-efaa3176a x
 ../systemd-upstream v234        d6d0473dc src-782c925f7 x
 ../systemd-upstream v236        83fefc888 src-f78a88bec x
-../systemd-upstream v237        bce40de9d src-6d8c71eb8 tgt-a4c1d1d54
+../systemd-upstream v237        245992a0c src-6d8c71eb8 tgt-6a7308317