--- a/uh_parser/RaptorError.pm Tue Aug 31 12:42:52 2010 +0100
+++ b/uh_parser/RaptorError.pm Tue Aug 31 16:17:03 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)";
}
--- a/uh_parser/RaptorUnreciped.pm Tue Aug 31 12:42:52 2010 +0100
+++ b/uh_parser/RaptorUnreciped.pm Tue Aug 31 16:17:03 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)";
}
--- a/uh_parser/RaptorWarning.pm Tue Aug 31 12:42:52 2010 +0100
+++ b/uh_parser/RaptorWarning.pm Tue Aug 31 16:17:03 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)";
}
--- a/uh_parser/truclean.pl Tue Aug 31 12:42:52 2010 +0100
+++ b/uh_parser/truclean.pl Tue Aug 31 16:17:03 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");