commit ac9c992cae2078c866b67341d929c61fe54f5437 Author: Nicolas Vigier boklm@torproject.org Date: Tue Oct 4 01:51:30 2016 +0200

Bug 20183: Only update OSX incremental mar files after adding code signing

Don't touch the incremental mar files for the other platforms when updating the OSX incremental mar files after adding code signing.

We add a MAR_SKIP_EXISTING environment variable which indicates to the gen_incrementals script that existing incremental mar files should not be regenerated. The old incremental mar files for OSX are removed by the dmg2mar script. --- gitian/Makefile | 4 ++-- tools/update-responses/update_responses | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gitian/Makefile b/gitian/Makefile index 59efd0e..f008834 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -48,12 +48,12 @@ signmars-nightly: dmg2mars: cd $(shell ../tools/update-responses/get_channel_version release) && ../../tools/dmg2mar $(TORSOCKS) ../tools/update-responses/download_missing_versions release - ../tools/update-responses/gen_incrementals release + MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals release

dmg2mars-alpha: cd $(shell ../tools/update-responses/get_channel_version alpha) && ../../tools/dmg2mar $(TORSOCKS) ../tools/update-responses/download_missing_versions alpha - ../tools/update-responses/gen_incrementals alpha + MAR_SKIP_EXISTING=1 ../tools/update-responses/gen_incrementals alpha

update_responses: ../tools/update-responses/update_responses release diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b83ac29..7962f69 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -175,8 +175,12 @@ sub mar_filename { sub create_incremental_mar { my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar"; - print "Starting $mar_file\n"; my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + if ($ENV{MAR_SKIP_EXISTING} && -f $mar_file_path) { + print "Skipping $mar_file\n"; + return; + } + print "Starting $mar_file\n"; my $download_url = "$config->{download}{mars_url}/$new_version"; my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0;