check_tree.pl : Fix transportation of elogind mask info

diff --git a/pwx/check_tree.pl b/pwx/check_tree.pl
index c293d6c9da50e4710e2fa3006848d299f095fafc..0fba81834b0bd51a4ffe096350eaca1b691f7587 100755 (executable)
--- a/pwx/check_tree.pl
+++ b/pwx/check_tree.pl
@@ -275,10 +275,6 @@ for my $file_part (@source_files) {
        for (my $pos = 0; $pos < $hFile{count}; ++$pos) {
                $hHunk = $hFile{hunks}[$pos]; ## Global shortcut
 
-               # The state of what the hunk did must be known:
-               $in_mask_block = $hHunk->{is_mask} && (!$hHunk->{is_endif}) ? 1 : 0;
-               $in_else_block = $hHunk->{is_else} && (!$hHunk->{is_endif}) ? 1 : 0;
-
                # (pre -> early out)
                hunk_is_useful or next;
 
@@ -475,8 +471,12 @@ sub build_output {
                $hHunk = $hFile{hunks}[$pos]; ## Global shortcut
 
                # The state of what the hunk did must be known:
-               $in_mask_block = $hHunk->{is_mask} && (!$hHunk->{is_endif}) ? 1 : 0;
-               $in_else_block = $hHunk->{is_else} && (!$hHunk->{is_endif}) ? 1 : 0;
+               $hHunk->{is_mask} and $in_mask_block = 1;
+               $hHunk->{is_else} and $in_else_block = 1;
+               if ($hHunk->{is_endif}) {
+                       $in_mask_block = 0;
+                       $in_else_block = 0;
+               };
 
                # The useless are to be skipped, but we need the [e]logind[m]ask[i]nfo
                if ($hHunk->{useful}) {

diff --git a/pwx/last_mutual_commits.csv b/pwx/last_mutual_commits.csv
index 24a922669fb6cfbb41359aa1b425e87f3106adcb..d57cce4bac50e3fcd0ed39299e492663efb965ae 100644 (file)
--- 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        245992a0c src-6d8c71eb8 tgt-6a7308317
+../systemd-upstream v237        5a8af7471 src-6d8c71eb8 tgt-41bbfe402