# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1283267665 -3600
# Node ID 09f57a9bad0776c10d93c592b6f35404d0c8c9da
# Parent  73890f073898d0ba3be59b66ed3c4ebebcc7947b
Add 'adapt' to the list of layers to match for heuristical pacakge attribution and for truclean

diff -r 73890f073898 -r 09f57a9bad07 uh_parser/RaptorError.pm
--- a/uh_parser/RaptorError.pm	Fri Jul 30 17:06:23 2010 +0100
+++ b/uh_parser/RaptorError.pm	Tue Aug 31 16:14:25 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[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s)
+		$characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation|adapt)[/\\][a-zA-Z]+[/\\]?),s)
 	{
 		$raptor_error_info->{bldinf} = "$1... (guessed)";
 	}
diff -r 73890f073898 -r 09f57a9bad07 uh_parser/RaptorUnreciped.pm
--- a/uh_parser/RaptorUnreciped.pm	Fri Jul 30 17:06:23 2010 +0100
+++ b/uh_parser/RaptorUnreciped.pm	Tue Aug 31 16:14:25 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[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s)
+		if ($line =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation|adapt)[/\\][a-zA-Z]+[/\\]?),s)
 		{
 			$guessed_bldinf = "$1... (guessed)";
 		}
diff -r 73890f073898 -r 09f57a9bad07 uh_parser/RaptorWarning.pm
--- a/uh_parser/RaptorWarning.pm	Fri Jul 30 17:06:23 2010 +0100
+++ b/uh_parser/RaptorWarning.pm	Tue Aug 31 16:14:25 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[/\\](os|mw|app|tools|ostools|adaptation)[/\\][a-zA-Z]+[/\\]?),s)
+		$characters =~ m,.*?([/\\]sf[/\\](os|mw|app|tools|ostools|adaptation|adapt)[/\\][a-zA-Z]+[/\\]?),s)
 	{
 		$raptor_warning_info->{bldinf} = "$1... (guessed)";
 	}
diff -r 73890f073898 -r 09f57a9bad07 uh_parser/truclean.pl
--- a/uh_parser/truclean.pl	Fri Jul 30 17:06:23 2010 +0100
+++ b/uh_parser/truclean.pl	Tue Aug 31 16:14:25 2010 +0100
@@ -64,7 +64,7 @@
 $packageexpr =~ s,^/,,;
 if (-d "$releaseablesdir/sf")
 {
-	$packageexpr = "sf/$packageexpr" if ($packageexpr =~ m,^(adaptation|app|mw|os|tools),);
+	$packageexpr = "sf/$packageexpr" if ($packageexpr =~ m,^(adaptation|adapt|app|mw|os|tools),);
 }
 
 my @targetfiles = grep {-f$_} glob("$releaseablesdir/$packageexpr/info.tsv");