From 762d6795e315badf8bec1b8ddd47e399f5ddc81c Mon Sep 17 00:00:00 2001
From: Dane Powell <danepowell@users.noreply.github.com>
Date: Fri, 10 Feb 2017 09:23:33 -0800
Subject: [PATCH] Import features twice. (#1073)

---
 phing/tasks/setup.xml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/phing/tasks/setup.xml b/phing/tasks/setup.xml
index 82b189dc0..d0ea73fd4 100644
--- a/phing/tasks/setup.xml
+++ b/phing/tasks/setup.xml
@@ -238,6 +238,16 @@
         </drush>
         <!-- Revert all features. -->
         <foreach list="${cm.features.bundle}" param="bundle" target="setup:update:features-import" />
+        <!-- Revert all features again! -->
+        <!-- @see https://www.drupal.org/node/2851532 -->
+        <foreach list="${cm.features.bundle}" param="bundle" target="setup:update:features-import" />
+        <if>
+          <equals arg1="${cm.features.no-overrides}" arg2="true"/>
+          <then>
+            <echo>Checking for features overrides...</echo>
+            <foreach list="${cm.features.bundle}" param="bundle" target="setup:update:features-override-check" />
+          </then>
+        </if>
       </then>
     </if>
     <!-- Rebuild caches. -->
@@ -290,17 +300,14 @@
     <drush command="fra" assume="yes" alias="${drush.alias}" passthru="false">
       <option name="bundle">${bundle}</option>
     </drush>
+  </target>
+
+  <target name="setup:update:features-override-check" description="Checks if features are overridden.">
+    <exec dir="${docroot}" command="${drush.cmd} fl --bundle=${bundle} | grep -Ei '(changed|conflicts|added)( *)$'" outputProperty="features.overrides"/>
     <if>
-      <equals arg1="${cm.features.no-overrides}" arg2="true"/>
+      <istrue value="${features.overrides}"/>
       <then>
-        <echo>Checking for features overrides...</echo>
-        <exec dir="${docroot}" command="${drush.cmd} fl --bundle=${bundle} | grep -Ei '(changed|conflicts|added)( *)$'" outputProperty="features.overrides"/>
-        <if>
-          <istrue value="${features.overrides}"/>
-          <then>
-            <fail>A feature in the ${bundle} bundle is overridden. You must re-export this feature to incorporate the changes.</fail>
-          </then>
-        </if>
+        <fail>A feature in the ${bundle} bundle is overridden. You must re-export this feature to incorporate the changes.</fail>
       </then>
     </if>
   </target>