--- a/uh_parser/RaptorError.pm	Tue May 11 13:39:54 2010 +0100
+++ b/uh_parser/RaptorError.pm	Wed May 12 10:32:26 2010 +0100
@@ -193,7 +193,7 @@
 	my $package = '';
 	# if bldinf attribute is not available then heuristically attempt to determine the package
 	if (!$raptor_error_info->{bldinf} &&
-		$characters =~ m,.*?([/\\]sf|sftools[/\\](os|mw|app|tools|ostools|adaptation|dev)[/\\][a-zA-Z]+[/\\]?),s)
+		$characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s)
 	{
 		$raptor_error_info->{bldinf} = "$1... (guessed)";
 	}
@@ -207,7 +207,7 @@
 		$raptor_error_info->{bldinf} =~ s,^[A-Za-z]:,,;
 		$raptor_error_info->{bldinf} =~ s,[\\],/,g;
 		
-		if ($raptor_error_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation|dev)/[a-zA-Z]+),)
+		if ($raptor_error_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),)
 		{
 			$package = $1;
 			$package =~ s,/,_,;

--- a/uh_parser/RaptorRecipe.pm	Tue May 11 13:39:54 2010 +0100
+++ b/uh_parser/RaptorRecipe.pm	Wed May 12 10:32:26 2010 +0100
@@ -256,7 +256,7 @@
 		$recipe_info->{bldinf} =~ s,[\\],/,g;
 		
 		my $package = '';
-		if ($recipe_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation|dev)/[a-zA-Z]+),)
+		if ($recipe_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),)
 		{
 			$package = $1;
 			$package =~ s,/,_,;

--- a/uh_parser/RaptorUnreciped.pm	Tue May 11 13:39:54 2010 +0100
+++ b/uh_parser/RaptorUnreciped.pm	Wed May 12 10:32:26 2010 +0100
@@ -169,7 +169,7 @@
 		my $package = '';
 		my $guessed_bldinf = '';
 		# if bldinf attribute is not available then heuristically attempt to determine the package
-		if ($line =~ m,.*?([/\\]sf|sftools[/\\](os|mw|app|tools|ostools|adaptation|dev)[/\\][a-zA-Z]+[/\\]?),s)
+		if ($line =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s)
 		{
 			$guessed_bldinf = "$1... (guessed)";
 		}
@@ -183,7 +183,7 @@
 			$guessed_bldinf =~ s,^[A-Za-z]:,,;
 			$guessed_bldinf =~ s,[\\],/,g;
 			
-			if ($guessed_bldinf =~ m,/((os|mw|app|tools|ostools|adaptation|dev)/[a-zA-Z]+),)
+			if ($guessed_bldinf =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),)
 			{
 				$package = $1;
 				$package =~ s,/,_,;

--- a/uh_parser/RaptorWarning.pm	Tue May 11 13:39:54 2010 +0100
+++ b/uh_parser/RaptorWarning.pm	Wed May 12 10:32:26 2010 +0100
@@ -123,7 +123,7 @@
 	my $package = '';
 	# if bldinf attribute is not available then heuristically attempt to determine the package
 	if (!$raptor_warning_info->{bldinf} &&
-		$characters =~ m,.*?([/\\]sf|sftools[/\\](os|mw|app|tools|ostools|adaptation|dev)[/\\][a-zA-Z]+[/\\]?),s)
+		$characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s)
 	{
 		$raptor_warning_info->{bldinf} = "$1... (guessed)";
 	}
@@ -137,7 +137,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|dev)/[a-zA-Z]+),)
+		if ($raptor_warning_info->{bldinf} =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),)
 		{
 			$package = $1;
 			$package =~ s,/,_,;

--- a/uh_parser/releaseables.pm	Tue May 11 13:39:54 2010 +0100
+++ b/uh_parser/releaseables.pm	Wed May 12 10:32:26 2010 +0100
@@ -225,7 +225,7 @@
 			$normalized =~ s,^[A-Za-z]:,,;
 			$normalized =~ s,[\\],/,g;
 			
-			$normalized =~ m,^/sf|sftools/([^/]+)/([^/]+)/,;
+			$normalized =~ m,^/sf/([^/]+)/([^/]+)/,;
 			my $layer = $1;
 			my $package = $2;
 			

--- a/uh_parser/uh.pl	Tue May 11 13:39:54 2010 +0100
+++ b/uh_parser/uh.pl	Wed May 12 10:32:26 2010 +0100
@@ -174,7 +174,7 @@
 		}
 		if ($failure->{component})
 		{
-			if ($failure->{component} =~ m,/((os|mw|app|tools|ostools|adaptation|unknown|dev)/[a-zA-Z]+),)
+			if ($failure->{component} =~ m,/((os|mw|app|tools|ostools|adaptation|unknown)/[a-zA-Z]+),)
 			{
 				$failure_package = $1;
 			}
@@ -502,7 +502,7 @@
 		$bldinf =~ s,[\\],/,g;
 		
 		my $package = '';
-		if ($bldinf =~ m,/((os|mw|app|tools|ostools|adaptation|unknown|dev)/[a-zA-Z]+),)
+		if ($bldinf =~ m,/((os|mw|app|tools|ostools|adaptation|unknown)/[a-zA-Z]+),)
 		{
 			$package = $1;
 		}