Ensuring that project.local.yml overrides core yml values. (#181)

acquia · Jun 20, 2016 · 57f59d2 · 57f59d2
1 parent f5adc13
commit 57f59d2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/template/build/core/phing/tasks/properties.xml b/template/build/core/phing/tasks/properties.xml
@@ -7,6 +7,9 @@
   <!-- Load the root project.yml file for this project. -->
   <property file="${repo.root}/project.yml" override="true"/>
 
+  <!-- Load file directory and binary locations. -->
+  <property file="${core.phing.dir}/build.yml" override="true"/>
+
   <!-- Load the local project.local.yml file for this project. -->
   <!--@todo Change this so that it is only loaded for local:* targets. -->
   <if>
@@ -16,9 +19,6 @@
     </then>
   </if>
 
-  <!-- Load file directory and binary locations. -->
-  <property file="${core.phing.dir}/build.yml" override="true"/>
-
   <!-- Extract PHP variable values from local.settings.php. -->
   <property name="local.settings.file" value="${docroot}/sites/${multisite.name}/settings/local.settings.php" />
   <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${local.settings.file}" overwrite="false" verbose="true"/>