960453 - Sync up changes to SDK code from bug 783047

Status: RESOLVED FIXED

(Add-on SDK Graveyard :: General, defect, P1)

Description

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

Bug 783047 touched python-lib/cuddlefish/prefs.py, and those changes need to get mirrored into github before the next uplift.


     1.1 --- a/addon-sdk/source/python-lib/cuddlefish/prefs.py
     1.2 +++ b/addon-sdk/source/python-lib/cuddlefish/prefs.py
     1.3 @@ -57,17 +57,16 @@ DEFAULT_FIREFOX_PREFS = {
     1.4      'devtools.chrome.enabled' : True,
     1.5  
     1.6      # From:
     1.7      # http://hg.mozilla.org/mozilla-central/file/1dd81c324ac7/build/automation.py.in#l388
     1.8      # Make url-classifier updates so rare that they won't affect tests.
     1.9      'urlclassifier.updateinterval' : 172800,
    1.10      # Point the url-classifier to a nonexistent local URL for fast failures.
    1.11      'browser.safebrowsing.provider.0.gethashURL' : 'http://localhost/safebrowsing-dummy/gethash',
    1.12 -    'browser.safebrowsing.provider.0.keyURL' : 'http://localhost/safebrowsing-dummy/newkey',
    1.13      'browser.safebrowsing.provider.0.updateURL' : 'http://localhost/safebrowsing-dummy/update',
    1.14      }
    1.15  
    1.16  # When launching a temporary new Thunderbird profile, use these preferences.
    1.17  # Note that these were taken from:
    1.18  # http://mxr.mozilla.org/comm-central/source/mail/test/mozmill/runtest.py

Comment 1

[Erik Vold [:erikvold] (please needinfo? me)]

Why don't I see this change in http://hgchanges.fractalbrew.com/fx-team/file/addon-sdk/source ?

Comment 2

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

(In reply to Erik Vold [:erikvold] [:ztatic] from comment #1)
> Why don't I see this change in
> http://hgchanges.fractalbrew.com/fx-team/file/addon-sdk/source ?

Hrm, I think my alert is still set to mozilla-inbound and not fx-team. I should probably change that at some point. Guess this hasn't been merged around yet?

Comment 3

[Erik Vold [:erikvold] (please needinfo? me)]

https://github.com/mozilla/addon-sdk/commit/ebf1b43421ac1e4792d07b2297459a99b7fd1997