[tor-bugs] #32475 [Applications/Tor Browser]: Reduce the number of locales we provide updates for in nightly

Tor Bug Tracker & Wiki blackhole at torproject.org
Mon Nov 25 14:47:18 UTC 2019


#32475: Reduce the number of locales we provide updates for in nightly
-------------------------------------------------+-------------------------
 Reporter:  boklm                                |          Owner:  boklm
     Type:  task                                 |         Status:
                                                 |  needs_review
 Priority:  Medium                               |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tbb-rbm, tbb-update,                 |  Actual Points:
  TorBrowserTeam201911R, ux-team                 |
Parent ID:  #18867                               |         Points:
 Reviewer:                                       |        Sponsor:
                                                 |  Sponsor9
-------------------------------------------------+-------------------------
Changes (by boklm):

 * keywords:  tbb-rbm, tbb-update, TorBrowserTeam201911, ux-team => tbb-rbm,
     tbb-update, TorBrowserTeam201911R, ux-team
 * status:  needs_revision => needs_review


Comment:

 Replying to [comment:11 gk]:
 > Replying to [comment:10 boklm]:
 > > I pushed a new revision of the patch in branch `bug_32475_v3`:
 > > https://gitweb.torproject.org/user/boklm/tor-browser-
 build.git/commit/?h=bug_32475_v3&id=0327f0a0676d6a377f4f8b042bb5d34247d9cd94
 > >
 > > This removes the hack that was used to check if a locale is in the
 `mar_locales` list.
 >
 > The update generation is following our bundle generation which is kind
 of split in two parts. The first part is used for `en-US` which is
 shipping no lang packs. The second part is used for all the other locales
 which ship with the respective lang pack.

 Yes. I'm wondering if we could simplify that and treat `en-US` like the
 other locales, maybe as a separate ticket.

 >
 > It's confusing that you only patch the second part but include en-US in
 the `mar_locales` given that `en-US` is *not* in `var/locales`. I guess we
 might got lucky as I can still see things working (the `en-US` .mar gets
 built in the first part as `var/build_mar` is defined but gets ignored in
 your patch because `IF mar_lang == lang;` is never `true`.

 Indeed, there is no need to have `en-US` in `var/mar_locales` as it is
 done separately. I removed it in a fixup commit:
 https://gitweb.torproject.org/user/boklm/tor-browser-
 build.git/commit/?h=bug_32475_v3&id=f5d41e06db6a8fc575b8a111711bbf9b3135ff38

 It seems also that we generate mar files for nightly builds even if
 `var/build_mar` is set to `0`. I fixed that in an other fixup commit:
 https://gitweb.torproject.org/user/boklm/tor-browser-
 build.git/commit/?h=bug_32475_v3&id=4000bbdbd796ffb24766a4f327edc16bbce7aeed

 And I squashed those two commits in `bug_32475_v4`:
 https://gitweb.torproject.org/user/boklm/tor-browser-
 build.git/commit/?h=bug_32475_v4&id=64eb73431061f1785aa791a3f779a2e1e92e1460

 > I find it error-prone as well that we continue to use at one hand `[% IF
 c("var/build_mar") -%]` and at the other hand `[% IF build_mar -%]` for
 deciding whether to create full .mar files or not.

 Hmm, I'm not sure how to make that less confusing. In the first case (for
 `en-US`) we only need to look at `c("var/build_mar")`. In the second case
 we need to use a local variable as it is more complicate. Would renaming
 the variable to something else than `build_mar` be less confusing?

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/32475#comment:12>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online


More information about the tor-bugs mailing list