resolve conflict

diff --git a/Changes b/Changes
index 5d3fc339fe9e313692f8718808674cb4e001bd45..7bb0b12e3dd5c5fc915ad483195f63584bf8d4d5 100644 (file)
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@
 2. fixed (long standing)a hole in PC17 handling
 3. added winclient.pl (actually just a very basic client) from Iain G0RDI
 4. Added Spanish as a language (thanks ea1dav) (g0vgs) 
+5. ignore BUST(ED) spots
 28Feb01=======================================================================
 1. allow sh/c gb7 (ie show the config of all gb7 nodes)(for example)
 2. get rid of spurious DXHash 'uninitialised' messages if no corresponding 

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c3a98ecd9c81c37784f73bb812988dedc8f11baf..42eb6b86731395c8a7f7bc108016b225f41a44d2 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -358,7 +358,7 @@ sub normal
                        # do some de-duping
                        $field[5] =~ s/^\s+//;      # take any leading blanks off
                        $field[2] = unpad($field[2]);   # take off leading and trailing blanks from spotted callsign
-                       if ($field[2] =~ /BUST|BUSTED$/) {
+                       if ($field[2] =~ /BUST\w*$/) {
                                dbg('chan', "PCPROT: useless 'BUSTED' spot");
                                return;
                        }