Skip to content

Bug 40944: Avoid parsing .incremental.mar files as non-incremental mars

boklm requested to merge boklm/tor-browser-build:bug_40944 into main

Merge Info

Related Issues

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Other: please explain

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • nightly builds : boklm
    • rebases/release-prep : dan_b, ma1, pierov, richard
    • security : ma1
    • signing : boklm, richard
    • updater : pierov
    • misc/other : pierov, richard

Change Description

With the changes from 6c264f8e, the incremental.mar files are now matching as non-incremental mar files. This was not the case before since incremental.mar did not have the right number of dashes and we were checking that the OS name didn't include a dash. To avoid that we now explicitly check that the mar filename does not end with incremental.mar before trying to use it as non-incremental mar file.

I generated incrementals for 13.0a3 and checked that it is fixing the .htaccess file in updates_responses.

I also added a commit to make an error if we encounter an unknown OS (which would have helped notice this issue).

And a commit for #40947 (closed).

Edited by boklm

Merge request reports