Closed
Bug 759460
Opened 13 years ago
Closed 13 years ago
Preprocess channel name into nsUpdateService.js instead of just using 'default'
Categories
(Toolkit :: Application Update, defect)
Tracking
()
RESOLVED
FIXED
mozilla14
People
(Reporter: robert.strong.bugs, Assigned: robert.strong.bugs)
References
Details
Attachments
(1 file)
(deleted),
patch
|
bbondy
:
review+
akeybl
:
approval-mozilla-aurora+
|
Details | Diff | Splinter Review |
To help mitigate problems with the channel name defined in the channel-prefs.js file I would like to change the channel name 'default' used in nsUpdateService.js to be the channel name defined during the build.
Patch coming up
Assignee | ||
Comment 1•13 years ago
|
||
This will also mitigate issues where the channel-prefs.js file disappears for whatever reason.
Assignee | ||
Comment 2•13 years ago
|
||
btw: this WILL NOT remove the channel-prefs.js file and the channel defined in channel-prefs.js will take precedence over this value.
Assignee | ||
Comment 3•13 years ago
|
||
Assignee: nobody → robert.bugzilla
Status: NEW → ASSIGNED
Attachment #628067 -
Flags: review?(netzen)
Comment 4•13 years ago
|
||
Comment on attachment 628067 [details] [diff] [review]
patch rev1 - preprocess the channel name into nsUpdateService.js
Review of attachment 628067 [details] [diff] [review]:
-----------------------------------------------------------------
function Update(update) {
this._properties = {};
this._patches = [];
this.isCompleteUpdate = false;
this.showPrompt = false;
this.showSurvey = false;
this.showNeverForVersion = false;
? this.channel = "default"
Does the line denoted with ? need to be updated to use this pref as well?
Attachment #628067 -
Flags: review?(netzen) → review+
Assignee | ||
Comment 5•13 years ago
|
||
(In reply to Brian R. Bondy [:bbondy] from comment #4)
> Comment on attachment 628067 [details] [diff] [review]
> patch rev1 - preprocess the channel name into nsUpdateService.js
>
> Review of attachment 628067 [details] [diff] [review]:
> -----------------------------------------------------------------
>
> function Update(update) {
> this._properties = {};
> this._patches = [];
> this.isCompleteUpdate = false;
> this.showPrompt = false;
> this.showSurvey = false;
> this.showNeverForVersion = false;
> ? this.channel = "default"
>
>
> Does the line denoted with ? need to be updated to use this pref as well?
It gets set from the update itself so it doesn't have to be set here.
http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/update/nsUpdateService.js#2566
Comment 6•13 years ago
|
||
sounds good, thanks
Assignee | ||
Comment 7•13 years ago
|
||
Pushed to mozilla-inbound
https://hg.mozilla.org/integration/mozilla-inbound/rev/3a8bfbf6d2f6
Comment 8•13 years ago
|
||
Status: ASSIGNED → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla15
Assignee | ||
Comment 9•13 years ago
|
||
Comment on attachment 628067 [details] [diff] [review]
patch rev1 - preprocess the channel name into nsUpdateService.js
[Approval Request Comment]
Bug caused by (feature/regressing bug #): This is a mitigation for Bug 746156 and Bug 756325
User impact if declined: Likely none. This handles the case where if the channel-prefs.js file which contains the channel name disappears the channel name will still be correct.
Testing completed (on m-c, etc.): Visual inspection of files in the build.
Risk to taking this patch (and alternatives if risky): Minimal.
String or UUID changes made by this patch: None
Attachment #628067 -
Flags: approval-mozilla-aurora?
Assignee | ||
Updated•13 years ago
|
status-firefox14:
--- → affected
status-firefox15:
--- → fixed
tracking-firefox14:
--- → ?
tracking-firefox15:
--- → ?
Assignee | ||
Comment 10•13 years ago
|
||
To verify this:
1. install a nightly build with the fix that has an update available.
2. delete the channel-prefs.js file from defaults/pref/channel-prefs.js
3. check if defaults/preferences/channel-prefs.js exists and if it does delete it.
4. launch Firefox.
5. verify in about:config that the app.update.channel pref does not exist.
6. verify that you can update to the latest.
Comment 11•13 years ago
|
||
Comment on attachment 628067 [details] [diff] [review]
patch rev1 - preprocess the channel name into nsUpdateService.js
[Triage Comment]
Approving for Aurora 14 given this is hardening of code and low risk.
Attachment #628067 -
Flags: approval-mozilla-aurora? → approval-mozilla-aurora+
Updated•13 years ago
|
Assignee | ||
Comment 12•13 years ago
|
||
Pushed tp mozilla-aurora
https://hg.mozilla.org/releases/mozilla-aurora/rev/49bd90effd98
Target Milestone: mozilla15 → mozilla14
You need to log in
before you can comment on or make changes to this bug.
Description
•