--- a/uh_parser/RaptorWarning.pm	Thu May 06 12:47:02 2010 +0100
+++ b/uh_parser/RaptorWarning.pm	Thu May 06 18:06:35 2010 +0100
@@ -122,7 +122,7 @@
 	my $package = '';
 	# if bldinf attribute is not available then heuristically attempt to determine the package
 	if (!$raptor_warning_info->{bldinf} &&
-		$characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][^/^\\]*[/\\]),s)
+		$characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s)
 	{
 		$raptor_warning_info->{bldinf} = "$1... (guessed)";
 	}
@@ -136,7 +136,7 @@
 		$raptor_warning_info->{bldinf} =~ s,^[A-Za-z]:,,;
 		$raptor_warning_info->{bldinf} =~ s,[\\],/,g;
 		
-		if ($raptor_warning_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[^/]*),)
+		if ($raptor_warning_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),)
 		{
 			$package = $1;
 			$package =~ s,/,_,;