Fix for total releasables count not appearing PDK_2.0.3
authorDario Sestito <darios@symbian.org>
Mon, 06 Sep 2010 12:00:01 +0100
changeset 295 2b7e66ca13ba
parent 294 a86b00626511
child 297 c52fbeec9580
Fix for total releasables count not appearing
uh_parser/releaseables.pm
uh_parser/uh.pl
--- a/uh_parser/releaseables.pm	Fri Sep 03 15:32:48 2010 +0100
+++ b/uh_parser/releaseables.pm	Mon Sep 06 12:00:01 2010 +0100
@@ -270,8 +270,9 @@
 	
 	for my $file (@files)
 	{
-		print "counting distinct releasables in file $file\n";
-		$file =~ /$::releaseablesdir[\\\/]*(.*)[\\\/]info\.tsv/;
+		#print "counting distinct releasables in file $file\n";
+		my $escaped_releaseablesdir = quotemeta($::releaseablesdir);
+		$file =~ m/$escaped_releaseablesdir[\\\/]*(.*)[\\\/]info\.tsv/;
 		my $package = $1;
 		$package =~ s,\\,/,g;
 		
@@ -290,7 +291,7 @@
 		my @distincts = grep {$_ ne $previous && ($previous = $_, 1) } sort @releasables;
 		
 		my $nd = scalar(@distincts);
-		print "adding $package -> $nd to releaseables_by_package\n";
+		#print "adding $package -> $nd to releaseables_by_package\n";
 		$::releaseables_by_package->{$package} = $nd;
 	}
 }
--- a/uh_parser/uh.pl	Fri Sep 03 15:32:48 2010 +0100
+++ b/uh_parser/uh.pl	Mon Sep 06 12:00:01 2010 +0100
@@ -151,6 +151,7 @@
 
 print "Generating HTML\n";
 
+$outputdir =~ s,/,\\,g;
 system("rd /S /Q $outputdir") if (-d $outputdir);
 mkdir ($outputdir);
 
@@ -319,7 +320,7 @@
 			$failuresbyseverity = $recipe_failures_num_by_severity->{$package}->{$_} if (defined $recipe_failures_num_by_severity->{$package}->{$_});
 			$packageline .= "<td>$failuresbyseverity</td>";
 		}
-		print "package $package, releasables in this package: $releaseables_by_package->{$package}\n";
+		#print "package $package, releasables in this package: $releaseables_by_package->{$package}\n";
 		$packageline .= "<td>".$missing_by_package->{$package}."/".$releaseables_by_package->{$package}."</td>" if ($missing);
 		$packageline .= "</tr>\n";
 		print AGGREGATED "$packageline\n";