Backout d29f06f3ff67 (Bug 840186) for orange galore
authorGregory Szorc <gps@mozilla.com>
Thu, 14 Feb 2013 11:12:48 -0800
changeset 131822 7c28a61eb677f15f54ddf3a250a648d7f55c81da
parent 131821 bad7ced53befbd1851026729c8e433e16a543806
child 131823 dad25c17ccc75af2fb451eadde6003cd4edfa5f7
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs840186
milestone21.0a1
backs outd29f06f3ff678940c3a8ae9b53fe3ec2255537c7
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout d29f06f3ff67 (Bug 840186) for orange galore CLOSED TREE
build/automation.py.in
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -528,20 +528,16 @@ user_pref("security.notification_enable_
 user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_computer", true);
 
 // Get network events.
 user_pref("network.activity.blipIntervalMilliseconds", 250);
 
 // Don't allow the Data Reporting service to prompt for policy acceptance.
 user_pref("datareporting.policy.dataSubmissionPolicyBypassAcceptance", true);
 
-// Point Firefox Health Report at a local server. We don't care if it actually
-// works. It just can't hit the default production endpoint.
-user_pref("datareporting.healthreport.documentServerURI", "http://%(server)/healthreport/");
-
 // Make sure CSS error reporting is enabled for tests
 user_pref("layout.css.report_errors", true);
 """ % { "server" : self.webServer + ":" + str(self.httpPort) }
     prefs.append(part)
 
     if useServerLocations:
       # We need to proxy every server but the primary one.
       origins = ["'%s://%s:%s'" % (l.scheme, l.host, l.port)
@@ -1289,10 +1285,9 @@ user_pref("camino.use_system_proxy_setti
       # "destination directory must not already exist".
       shutil.copytree(extensionSource, os.path.join(extensionsRootDir, extensionID))
 
     else:
       self.log.info("INFO | automation.py | Cannot install extension, invalid extensionSource at: %s", extensionSource)
 
   def elf_arm(self, filename):
     data = open(filename, 'rb').read(20)
-    return data[:4] == "\x7fELF" and ord(data[18]) == 40 # EM_ARM
-
+    return data[:4] == "\x7fELF" and ord(data[18]) == 40 # EM_ARM
\ No newline at end of file