mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #748 from flatcar/krnowak/blocker-fix

Browse Source 
update_chroot: Fix some non-fatal error noise
This commit is contained in:
Krzesimir Nowak 2023-05-03 09:47:53 +02:00 committed by GitHub
commit 979d7d0720
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_library/update_chroot_util.sh
View File

@ -6,7 +6,7 @@ get_versions_from_equery() {
local equery_cmd="${1}"
local pkg="${2}"
"${equery_cmd}" --quiet --no-color list --format='${version} ${fullversion}' "${pkg}"
"${equery_cmd}" --quiet --no-color list --format='${version} ${fullversion}' "${pkg}" || :
}
filter_out_too_new() {

3
update_chroot
View File

@ -248,7 +248,8 @@ info "Maybe removing some hard blocks"
# versions have !!<dev-python/setuptools_scm-2 in BDEPEND).
remove_hard_blocks \
sudo_e_emerge equery \
dev-python/setuptools_scm:2
dev-python/setuptools_scm:2 \
dev-python/setuptools-scm:2
# Second pass, update everything else.
EMERGE_FLAGS+=( --deep )