[tor-commits] [Git][tpo/applications/tor-browser-build][main] 3 commits: Bug 40944: Avoid parsing .incremental.mar files as non-incremental mars

[richard (@richard)]

richard pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
486e1ea1 by Nicolas Vigier at 2023-09-06T18:38:34+00:00
Bug 40944: Avoid parsing .incremental.mar files as non-incremental mars

- - - - -
20b24282 by Nicolas Vigier at 2023-09-06T18:38:34+00:00
Bug 40944: In update_responses, make an error if we see an unkwown OS

If a mar file is found with an OS name that doesn't have a corresponding
`build_targets` entry in the config, the OS name was being used as build
target to generate the `.htaccess` file. This is not supposed to happen,
except when something is wrong, so instead we should make an error in
that case.

- - - - -
f6da50f9 by Nicolas Vigier at 2023-09-06T18:38:34+00:00
Bug 40947: Remove migrate_langs from tools/signing/nightly/update-responses-base-config.yml

- - - - -


2 changed files:

- tools/signing/nightly/update-responses-base-config.yml
- tools/update-responses/update_responses


Changes:

=====================================
tools/signing/nightly/update-responses-base-config.yml
=====================================
@@ -18,8 +18,6 @@ versions:
     nightly_version:
         platformVersion: 115.1.0
         detailsURL: http://umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad.onion/
-        migrate_langs:
-            pt-PT: pt-BR
         macos:
             minSupportedOSVersion: 16.0.0
         windows-i686:


=====================================
tools/update-responses/update_responses
=====================================
@@ -50,7 +50,7 @@ sub get_tmpdir {
 }
 
 sub build_targets_by_os {
-    return ($_[0]) unless $config->{build_targets}{$_[0]};
+    exit_error "Unknown build target for OS $_[0]" unless $config->{build_targets}{$_[0]};
     my $r = $config->{build_targets}{$_[0]};
     return ref $r eq 'ARRAY' ? @$r : ($r);
 }
@@ -98,7 +98,8 @@ sub get_version_files {
     opendir(my $d, $vdir) or exit_error "Error opening directory $vdir";
     foreach my $file (readdir $d) {
         next unless -f "$vdir/$file";
-        if ($file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) {
+        if ($file !~ m/incremental\.mar$/ &&
+            $file =~ m/^$appname-(.+)-${version}_(.+)\.mar$/) {
             my ($os, $lang) = ($1, $2);
             $files->{$os}{$lang}{complete} = {
                 type => 'complete',



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/639e16714ed6d45b48d4ebf466ce5e238327e00a...f6da50f955b60ced64d4399e0907e37879a81b1e

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/639e16714ed6d45b48d4ebf466ce5e238327e00a...f6da50f955b60ced64d4399e0907e37879a81b1e
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230906/f3c60b4f/attachment-0001.htm>