filter out some invalid warnings

1 files changed, 11 insertions, 3 deletions

diff --git a/perl5/Local/Homedir.pm b/perl5/Local/Homedir.pm
index 63b37fb0..09183909 100644
--- a/perl5/Local/Homedir.pm
+++ b/perl5/Local/Homedir.pm
@@ -40,10 +40,18 @@ sub normalise_mrconfig {
 
     my %master_blocks = blocks_from_file($master);
     my %target_blocks = -f $target ? blocks_from_file($target) : ();
+
+    my $warning = "DO NOT EDIT THIS BLOCK; automatically updated from";
+
+    # filter out any DO NOT EDIT comments because if these blocks were
+    # removed from ~/.mrconfig.in but the repos are still present on
+    # this machine, those lines would be misleading
+    $target_blocks{$_} =~ s/^# ($warning|  $master)\n//mg
+      for keys %target_blocks;
+
     for (keys %master_blocks) {
-        $target_blocks{$_} =
-          "# DO NOT EDIT THIS BLOCK; automatically updated from\n#   $master\n"
-          . join "\n", grep !/^\s*#|^\s*$/, split "\n", $master_blocks{$_};
+        $target_blocks{$_} = "# $warning\n#   $master\n" . join "\n",
+          grep !/^\s*#|^\s*$/, split "\n", $master_blocks{$_};
     }
 
     open my $fh, '>', $target;