Bug 521673 - Remove remnant OJI references; (Bv1) /toolkit/mozapps/installer/makecfgini.pl.
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 04 Mar 2010 19:19:41 +0100
changeset 38939 029aebe715a95b7dc1c57ab2a23130750acc5081
parent 38938 cdcca90867d3cfb86782577be36d17966725a300
child 38940 2e36bf8324d81ab20e4ec579a9bf3415bdfa1832
push id11947
push usersgautherie.bz@free.fr
push dateThu, 04 Mar 2010 18:20:35 +0000
treeherdermozilla-central@c4169105a5d4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs521673
milestone1.9.3a3pre
Bug 521673 - Remove remnant OJI references; (Bv1) /toolkit/mozapps/installer/makecfgini.pl. r=benjamin.
toolkit/mozapps/installer/makecfgini.pl
--- a/toolkit/mozapps/installer/makecfgini.pl
+++ b/toolkit/mozapps/installer/makecfgini.pl
@@ -152,24 +152,16 @@ while($line = <fpInIt>)
         $componentName = substr($componentName, 0, length($componentName) - 2) . "\n";
       }
       else {
         chop($componentName);
       }
 
       $installSize = OutputInstallSize("$inStagePath/$componentName");
 
-      # special oji consideration here.  Since it's an installer that 
-      # seamonkey installer will be calling, the disk space allocation
-      # needs to be adjusted by an expansion factor of 3.62.
-      if($componentName =~ /oji/i)
-      {
-        $installSize = int($installSize * 3.62);
-      }
-
       if($componentName =~ /gre/i)
       {
         $installSize = int($installSize * 4.48);
       }
     }
 
     # Read the next line to calculate for the "Install Size System="
     if($line = <fpInIt>)