--- a/uh_parser/RaptorError.pm	Mon Apr 12 13:26:38 2010 +0100
+++ b/uh_parser/RaptorError.pm	Mon Apr 12 14:47:03 2010 +0100
@@ -190,7 +190,7 @@
 	my $package = '';
 	# if bldinf attribute is not available then heuristically attempt to determine the package
 	if (!$raptor_error_info->{bldinf} &&
-		$characters =~ m,.*?(([/\\]sf)?[/\\](os|mw|app|tools|ostools|adaptation)[/\\][^/^\\]*[/\\]),s)
+		$characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][^/^\\]*[/\\]),s)
 	{
 		$raptor_error_info->{bldinf} = "$1... (guessed)";
 	}

--- a/uh_parser/RaptorUnreciped.pm	Mon Apr 12 13:26:38 2010 +0100
+++ b/uh_parser/RaptorUnreciped.pm	Mon Apr 12 14:47:03 2010 +0100
@@ -175,7 +175,7 @@
 		my $package = '';
 		my $guessed_bldinf = '';
 		# if bldinf attribute is not available then heuristically attempt to determine the package
-		if ($line =~ m,.*?(([/\\]sf)?[/\\](os|mw|app|tools|ostools|adaptation)[/\\][^/^\\]*[/\\]),s)
+		if ($line =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][^/^\\]*[/\\]),s)
 		{
 			$guessed_bldinf = "$1... (guessed)";
 		}

--- a/uh_parser/RaptorWarning.pm	Mon Apr 12 13:26:38 2010 +0100
+++ b/uh_parser/RaptorWarning.pm	Mon Apr 12 14:47:03 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)[/\\][^/^\\]*[/\\]),s)
 	{
 		$raptor_warning_info->{bldinf} = "$1... (guessed)";
 	}