From c87d2b5fa2c0bdfe200cdb5007be1366fc82f572 Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Wed, 14 Jun 2017 14:55:05 -0700
Subject: [PATCH] update_chroot: fix SDK updates during the Perl 5.24 upgrade

This supports cleanly downgrading to 5.22 for this release channel.
It does this by rebuilding problematic Perl modules on every run.
---
 update_chroot | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/update_chroot b/update_chroot
index 2946589cea..b271c9c91a 100755
--- a/update_chroot
+++ b/update_chroot
@@ -197,13 +197,11 @@ if [[ "${FLAGS_jobs}" -ne -1 ]]; then
   REBUILD_FLAGS+=( "--jobs=${FLAGS_jobs}" )
 fi
 
-# Force rebuilding some misbehaving Perl modules for the 5.22 upgrade.
-if : || portageq has_version / '<dev-lang/perl-5.22'; then
-  EMERGE_FLAGS+=(
-    --reinstall-atoms='dev-perl/File-Slurp dev-perl/Locale-gettext perl-core/File-Temp'
-    --usepkg-exclude='dev-perl/File-Slurp dev-perl/Locale-gettext perl-core/File-Temp'
-  )
-fi
+# Force rebuilding some misbehaving Perl modules to downgrade from 5.24.
+EMERGE_FLAGS+=(
+  --reinstall-atoms='dev-perl/File-Slurp dev-perl/Locale-gettext dev-perl/XML-Parser perl-core/File-Temp virtual/perl-File-Temp'
+  --usepkg-exclude='dev-perl/File-Slurp dev-perl/Locale-gettext dev-perl/XML-Parser perl-core/File-Temp virtual/perl-File-Temp'
+)
 
 # Perform an update of coreos-devel/sdk-depends and world in the chroot.
 EMERGE_CMD="emerge"