Merge pull request #854 from dm0-/rust

update_chroot: Work around dead cargo file conflicts
This commit is contained in:
David Michael 2018-11-15 08:36:45 -05:00 committed by GitHub
commit ca516260e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -234,7 +234,7 @@ if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
fi fi
# XXX: Work around a rename; delete this after SDKs contain the new package. # XXX: Work around a rename; delete this after SDKs contain the new package.
sudo -E ${EMERGE_CMD} --rage-clean app-crypt/sbsigntool 2>/dev/null || : sudo -E ${EMERGE_CMD} --rage-clean app-crypt/sbsigntool dev-util/cargo 2>/dev/null || :
# Second pass, update everything else. # Second pass, update everything else.
EMERGE_FLAGS+=( --deep ) EMERGE_FLAGS+=( --deep )