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

Commits:

1 changed file:

Changes:

  • projects/container-image/config
    ... ... @@ -53,16 +53,20 @@ pre: |
    53 53
          IF pc(c('origin_project'), 'var/arch_deps', { step => c('origin_step') });
    
    54 54
            CALL deps.import(pc(c('origin_project'), 'var/arch_deps', { step => c('origin_step') }));
    
    55 55
          END;
    
    56
    -     IF deps.size;
    
    57
    -       IF pc(c('origin_project'), 'var/sort_deps', { step => c('origin_step') });
    
    58
    -         deps = deps.sort;
    
    56
    +     res_deps = [];
    
    57
    +     FOREACH pkg IN deps;
    
    58
    +       SET res_pkg = tmpl(pkg);
    
    59
    +       IF res_pkg;
    
    60
    +         res_deps.push(res_pkg);
    
    59 61
            END;
    
    60
    -       FOREACH pkg IN deps;
    
    61
    -         SET p = tmpl(pkg);
    
    62
    -         IF p;
    
    63
    -           GET c('install_package', { pkg_name => p });
    
    64
    -           GET "\n";
    
    65
    -         END;
    
    62
    +     END;
    
    63
    +     IF pc(c('origin_project'), 'var/sort_deps', { step => c('origin_step') });
    
    64
    +       res_deps = res_deps.sort.unique;
    
    65
    +     END;
    
    66
    +     IF res_deps.size;
    
    67
    +       FOREACH pkg IN res_deps;
    
    68
    +         GET c('install_package', { pkg_name => pkg });
    
    69
    +         GET "\n";
    
    66 70
            END;
    
    67 71
          END;
    
    68 72
       -%]