Opened 4 months ago

Closed 2 months ago

Last modified 2 months ago

#26216 closed defect (fixed)

Fix broken MAR file generation ( `(( count++ ))` breaks now)

Reported by: gk Owned by: tbb-team
Priority: High Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: ff60-esr, TorBrowserTeam201807R
Cc: sukhbir, mcs, brade Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

While preparing nightly builds in #26073 we realized that MAR file generation is broken now. For some reason (( count++ )) in common.sh does not work anymore and breaks the build. We worked around that for the full MAR file generation in commit b135c59f65dba827b61379a4945251e148c43291 on tor-browser-60.0.1esr-8.0-1 but should create a proper patch and figure out what's actually going on.

Child Tickets

Change History (8)

comment:1 Changed 3 months ago by gk

Keywords: TorBrowserTeam201806 added; TorBrowserTeam201805 removed

Moving our tickets to June 2018

comment:2 Changed 3 months ago by sukhbir

Status: newneeds_review

comment:3 Changed 3 months ago by gk

Keywords: TorBrowserTeam201806R added; TorBrowserTeam201806 removed

comment:4 Changed 3 months ago by gk

Keywords: TorBrowserTeam201806 added; TorBrowserTeam201806R removed
Status: needs_reviewneeds_revision

Could you base your patch(es) on tor-browser-60.1.0esr-8.0-1 and split the fix up into two commits, one against the commit that introduced the set -e and one against the workaround I introduced in commit 9ebb4cfb3d88543eac674bef8b72607cf29ce2d0?

comment:5 Changed 3 months ago by sukhbir

Status: needs_revisionneeds_review

comment:6 Changed 3 months ago by gk

Keywords: TorBrowserTeam201807R added; TorBrowserTeam201806 removed

comment:7 Changed 2 months ago by gk

Resolution: fixed
Status: needs_reviewclosed

Thanks. I cherry-picked the fix against the commit that introduced set -e (commit 3ea5140e0bb662dee230a99c8fceaadb51e93ae1 on tor-browser-60.1.0esr-8.0-1) and the other one is a simple revert (commit d94df634a18daca48ce92bf7ddff306a2b072f83 on tor-browser-60.1.0esr-8.0-1) so that the rebase next time takes care of that.

comment:8 Changed 2 months ago by gk

FWIW I opened #26907 to think harder about a good way to guard against failures during MAR file generation.

Note: See TracTickets for help on using tickets.