From: minima <minima>
Date: Sat, 3 Mar 2001 21:09:45 +0000 (+0000)
Subject: resolve conflict
X-Git-Tag: R_1_47~146
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b0375778a3330147c3cee881856f9328a8541966;p=spider.git

resolve conflict
---

diff --git a/Changes b/Changes
index 5d3fc339..7bb0b12e 100644
--- 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 c3a98ecd..42eb6b86 100644
--- 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;
 			}