[tor-bugs] #26472 [Applications/Tor Browser]: Generating incremental mars for tbb-8.0a9-build2 fails

[Tor Bug Tracker & Wiki]

#26472: Generating incremental mars for tbb-8.0a9-build2 fails
--------------------------------------+--------------------------
 Reporter:  boklm                     |          Owner:  tbb-team
     Type:  defect                    |         Status:  new
 Priority:  Very High                 |      Milestone:
Component:  Applications/Tor Browser  |        Version:
 Severity:  Normal                    |     Resolution:
 Keywords:  TorBrowserTeam201806      |  Actual Points:
Parent ID:                            |         Points:
 Reviewer:                            |        Sponsor:
--------------------------------------+--------------------------
Changes (by boklm):

 * cc: mcs, brade (added)


Comment:

 It seems to be related to adding `set -e` at the beginning of the
 `make_incremental_update.sh` script (#24476).

 There are some places where the output of some commands is expected to be
 something else than 0:
 {{{
   # NoScript is a packed extension, so we simply compare the old and the
 new
   # .xpi files.
   noscript_path="$ext_path/$noscript"
   diff -a "$olddir/$noscript_path" "$newdir/$noscript_path" > /dev/null
   rc=$?
   if [ $rc -gt 1 ]; then
     notice "Unexpected exit $rc from $noscript_path diff command"
     exit 2
   elif [ $rc -eq 1 ]; then
     requested_forced_updates="$requested_forced_updates $noscript_path"
   fi
 }}}

 With `set -e` the script exits immediately when the `diff` command fails.

 I think we should disable `set -e` in those places.

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