Bug 418682: teach compare-locales to ignore the protocol handler prefs, as it does with other prefs that aren't required, r=bsmedberg, a=NPOTB
authorgavin@gavinsharp.com
Wed, 20 Feb 2008 13:03:15 -0800
changeset 11965 c10a9df823d66a926e8fa9acffff54426a7da2fb
parent 11964 8a433dfb5fa586be0b2936bb1de337dda832de38
child 11966 5d4c20b6f2d9a4e1db6fba9e864ae6900f6b3ac3
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg, NPOTB
bugs418682
milestone1.9b4pre
Bug 418682: teach compare-locales to ignore the protocol handler prefs, as it does with other prefs that aren't required, r=bsmedberg, a=NPOTB
toolkit/locales/compare-locales.pl
--- a/toolkit/locales/compare-locales.pl
+++ b/toolkit/locales/compare-locales.pl
@@ -119,29 +119,33 @@ sub compareProperties
     my %entities2 = map { $_ => 1 } readProperties("$gSourceDir2/$path");
 
     my @extra1;
 
     foreach my $entity (@entities1) {
         if (exists $entities2{$entity}) {
             delete $entities2{$entity};
         } else {
-# hack around region.properties#browser.search.order.[1-9]
+# hack to ignore non-fatal region.properties differences
             if ($path !~ /chrome\/browser-region\/region\.properties$/ or
                 ($entity !~ /browser\.search\.order\.[1-9]/ and
-                 $entity !~ /browser\.contentHandlers\.types\.[0-5]/)) {
+                 $entity !~ /browser\.contentHandlers\.types\.[0-5]/ and
+                 $entity !~ /gecko\.handlerService\.schemes\./ and
+                 $entity !~ /gecko\.handlerService\.defaultHandlersVersion/)) {
                 push @extra1, $entity;
             }
         }
     }
-# hack around region.properties#browser.search.order.[1-9]
+# hack to ignore non-fatal region.properties differences
     if ($path =~ /chrome\/browser-region\/region\.properties$/) {
         foreach $entity (keys(%entities2)) {
             if ($entity =~ /browser\.search\.order\.[1-9]/ ||
-                $entity =~ /browser\.contentHandlers\.types\.[0-5]/) {
+                $entity =~ /browser\.contentHandlers\.types\.[0-5]/ ||
+                $entity =~ /gecko\.handlerService\.schemes\./ ||
+                $entity =~ /gecko\.handlerService\.defaultHandlersVersion/) {
                 delete $entities2{$entity};
             }
         }
     }
 
     if (@extra1 or keys %entities2) {
         $failure = 1;
         print "Properties in $path don't match:\n";