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

Commits:

1 changed file:

Changes:

  • projects/container-image/config
    ... ... @@ -34,11 +34,14 @@ pre: |
    34 34
       apt-get update -y -q
    
    35 35
       [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) -%]
    
    36 36
         [% pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) %]
    
    37
    -    [% IF c("var/linux-cross") && ! pc(c('origin_project'), 'var/no_crosscompile', { step => c('origin_step') }) -%]
    
    38
    -      dpkg --add-architecture [% c("var/arch_debian") %]
    
    39
    -    [% END -%]
    
    40
    -    # Update the package cache again because `pre_pkginst` may change the
    
    41
    -    # package manager configuration.
    
    37
    +  [% END -%]
    
    38
    +  [% IF c("var/linux-cross") && ! pc(c('origin_project'), 'var/no_crosscompile', { step => c('origin_step') }) -%]
    
    39
    +    dpkg --add-architecture [% c("var/arch_debian") %]
    
    40
    +  [% END -%]
    
    41
    +  [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) ||
    
    42
    +     ( c("var/linux-cross") && ! pc(c('origin_project'), 'var/no_crosscompile', { step => c('origin_step') }) ) -%]
    
    43
    +    # Update the package cache again because `pre_pkginst` or
    
    44
    +    # `dpkg --add-architecture` may change the package manager configuration.
    
    42 45
         apt-get update -y -q
    
    43 46
       [% END -%]
    
    44 47
       apt-get upgrade -y -q