From fceffdb6601d146fd20adb8528a954c614822ccf Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 14 Nov 2018 21:09:52 +0000 Subject: [PATCH] update_chroot: Work around dead cargo file conflicts --- update_chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_chroot b/update_chroot index b9eff5847a..293d6bfef7 100755 --- a/update_chroot +++ b/update_chroot @@ -234,7 +234,7 @@ if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then fi # 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. EMERGE_FLAGS+=( --deep )