# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1268145506 0
# Node ID f00ca95005216b59db6fe96b7fb888f540573ffa
# Parent  0d02b2df4cbb22e147ee1590800dcd4285ef360c# Parent  dbf40764ca6ad49999b27b4edb3d7dc3755edad6
Catchup merge

diff -r 0d02b2df4cbb -r f00ca9500521 uh_parser/RaptorUnreciped.pm
--- a/uh_parser/RaptorUnreciped.pm	Tue Mar 09 14:37:22 2010 +0000
+++ b/uh_parser/RaptorUnreciped.pm	Tue Mar 09 14:38:26 2010 +0000
@@ -84,31 +84,31 @@
 		my $subcategory = $CATEGORY_RAPTORUNRECIPED_OVERRIDINGCOMMANDSFORTARGET;
 		RaptorCommon::dump_fault($category, $subcategory, $severity, $logfile, $component, $mmp, $phase, $recipe, $file);
 	}
-	elsif ($text =~ m,^make: Target .* not remade because of errors\.,)
+	elsif ($text =~ m,^make(\.exe)?: Target .* not remade because of errors\.,)
 	{
 		$severity = $RaptorCommon::SEVERITY_MINOR;
 		my $subcategory = $CATEGORY_RAPTORUNRECIPED_MAKE_TARGETNOTREMADEBECAUSEOFERRORS;
 		RaptorCommon::dump_fault($category, $subcategory, $severity, $logfile, $component, $mmp, $phase, $recipe, $file);
 	}
-	elsif ($text =~ m,^make: \*\*\* .* Error 1,)
+	elsif ($text =~ m,^make(\.exe)?: \*\*\* .* Error 1,)
 	{
 		$severity = $RaptorCommon::SEVERITY_MINOR;
 		my $subcategory = $CATEGORY_RAPTORUNRECIPED_MAKE_ERROR1;
 		RaptorCommon::dump_fault($category, $subcategory, $severity, $logfile, $component, $mmp, $phase, $recipe, $file);
 	}
-	elsif ($text =~ m,^make: \*\*\* No rule to make target .*\ needed by .*,)
+	elsif ($text =~ m,^make(\.exe)?: \*\*\* No rule to make target .*\ needed by .*,)
 	{
 		$severity = $RaptorCommon::SEVERITY_MINOR;
 		my $subcategory = $CATEGORY_RAPTORUNRECIPED_MAKE_NORULETOMAKETARGETNEEDEDBY;
 		RaptorCommon::dump_fault($category, $subcategory, $severity, $logfile, $component, $mmp, $phase, $recipe, $file);
 	}
-	elsif ($text =~ m,^make: \*\*\* No rule to make target .*,)
+	elsif ($text =~ m,^make(\.exe)?: \*\*\* No rule to make target .*,)
 	{
 		$severity = $RaptorCommon::SEVERITY_MINOR;
 		my $subcategory = $CATEGORY_RAPTORUNRECIPED_MAKE_NORULETOMAKETARGET;
 		RaptorCommon::dump_fault($category, $subcategory, $severity, $logfile, $component, $mmp, $phase, $recipe, $file);
 	}
-	elsif ($text =~ m,^make: Nothing to be done for .*,)
+	elsif ($text =~ m,^make(\.exe)?: Nothing to be done for .*,)
 	{
 		# don't dump
 		$dumped = 0;
diff -r 0d02b2df4cbb -r f00ca9500521 uh_parser/uh.pl
--- a/uh_parser/uh.pl	Tue Mar 09 14:37:22 2010 +0000
+++ b/uh_parser/uh.pl	Tue Mar 09 14:38:26 2010 +0000
@@ -25,6 +25,8 @@
 use RaptorSAXHandler;
 use Getopt::Long;
 
+use CGI;
+
 our $raptorbitsdir = 'raptorbits';
 our $basedir = '';
 my $outputdir = "html";
@@ -366,6 +368,7 @@
 		}
 		close(FILE);
 		
+		$filecontent = CGI::escapeHTML($filecontent);
 		$filecontent =~ s,---(failure_item_\d+)---,<a name="$1">---$1---</a>,g;
 		$filecontent = "<pre>$filecontent</pre>";