boklm pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
9727a2cd by NoisyCoil at 2024-11-18T17:27:59+01:00
Bug 41306,41307: Resolve templates before sorting and making unique container
deps
- - - - -
1 changed file:
- projects/container-image/config
Changes:
=====================================
projects/container-image/config
=====================================
@@ -53,16 +53,20 @@ pre: |
IF pc(c('origin_project'), 'var/arch_deps', { step => c('origin_step') });
CALL deps.import(pc(c('origin_project'), 'var/arch_deps', { step =>
c('origin_step') }));
END;
- IF deps.size;
- IF pc(c('origin_project'), 'var/sort_deps', { step => c('origin_step')
});
- deps = deps.sort;
+ res_deps = [];
+ FOREACH pkg IN deps;
+ SET res_pkg = tmpl(pkg);
+ IF res_pkg;
+ res_deps.push(res_pkg);
END;
- FOREACH pkg IN deps;
- SET p = tmpl(pkg);
- IF p;
- GET c('install_package', { pkg_name => p });
- GET "\n";
- END;
+ END;
+ IF pc(c('origin_project'), 'var/sort_deps', { step => c('origin_step') });
+ res_deps = res_deps.sort.unique;
+ END;
+ IF res_deps.size;
+ FOREACH pkg IN res_deps;
+ GET c('install_package', { pkg_name => pkg });
+ GET "\n";
END;
END;
-%]
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9727a2cdf3533036ea35e5eecb1d8d70876df330
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9727a2cdf3533036ea35e5eecb1d8d70876df330
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
