[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

Title: GitLab

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:

Changes:

  • tools/signing/nightly/update-responses-base-config.yml
    ... ... @@ -18,8 +18,6 @@ versions:
    18 18 
         nightly_version:
    19 19 
             platformVersion: 115.1.0
    20 20 
             detailsURL: http://umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad.onion/
    21 
    -        migrate_langs:
    22 
    -            pt-PT: pt-BR
    23 21 
             macos:
    24 22 
                 minSupportedOSVersion: 16.0.0
    25 23 
             windows-i686:

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits