Fixes acquia#1177 acquia#1176: Cloud hooks cause warnings and errors.

grasmash · Mar 10, 2017 · d0cdb6d · d0cdb6d
1 parent 464e4c4
commit d0cdb6d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/phing/tasks/deploy.xml b/phing/tasks/deploy.xml
@@ -239,15 +239,19 @@
 
   <!-- Wrapper for setup:update that sets some environment-specific variables first. -->
   <target name="deploy:update" description="Update current database to reflect the state of the Drupal file system; uses local drush alias.">
+    <foreach list="${multisite.name}" param="deploy.site.name" target="deploy:update:site"/>
+  </target>
+
+  <target name="deploy:update:site" description="Update current database to reflect the state of the Drupal file system; uses local drush alias.">
     <phingcall target="setup:update">
       <!-- Drush fails to include some files. @see https://github.com/drush-ops/drush/issues/2497#issuecomment-279049111 -->
       <property name="drush.bin" value="${drush.bin} --include=../drush" override="true" />
       <!-- Environment parameter is used to determine which modules to toggle. On ACE, will be overridden by one of dev/stage/prod. -->
       <param name="environment" value="deploy"/>
-      <!-- Drush alias should be set to sites to update all sites. -->
-      <property name="drush.alias" value="sites"/>
-      <!-- Kill Drush uri, since we want to run updates against all sites. -->
-      <property name="drush.uri" value=""/>
+      <!-- Drush alias should be set to sites to update any sites. -->
+      <property name="drush.alias" value=""/>
+      <!-- Kill Drush uri, since we want to run updates against all site. -->
+      <property name="drush.uri" value="${deploy.site.name}"/>
       <!-- Most sites store their version-controlled configuration in /config/default. -->
       <!-- ACE internally sets the vcs configuration directory to /config/default, so we use that. -->
       <property name="cm.core.config-dir.key" value="${cm.core.config-dir.deploy-key}"/>

diff --git a/phing/tasks/properties.xml b/phing/tasks/properties.xml
@@ -66,8 +66,8 @@
       <if>
         <available file="${docroot}/sites"/>
         <then>
-          <!-- Find directories in ${docroot}/sites/*/ and format into a comma-separated list. -->
-          <exec command="find ${docroot}/sites/* -maxdepth 0 -type d | sed -e 's%${docroot}/sites/%%g' -e '2,$s%^%,%' | tr -d '\n'"
+          <!-- Find directories in ${docroot}/sites/*/ and format into a comma-separated list. Exclude ${docroot}/sites/g. -->
+          <exec command="find ${docroot}/sites/* -maxdepth 0 -type d | grep -v -e '${docroot}/sites/g$' | sed -e 's%${docroot}/sites/%%g' -e '2,$s%^%,%' | tr -d '\n'"
                 outputProperty="multisite.name" logoutput="false" checkreturn="true"/>
         </then>
         <else>

diff --git a/template/hooks/common/slack.sh b/template/hooks/common/slack.sh
@@ -18,5 +18,5 @@ if [ -f $FILE ]; then
     fi
   fi
 else
-  echo "File $FILE does not exist."
+  echo "Notice: Slack notifications disabled: file $FILE does not exist."
 fi
diff --git a/tests/phpunit/phpunit.xml b/tests/phpunit/phpunit.xml
@@ -5,7 +5,7 @@
     <php>
         <const name="BLT_ENV" value="ci"/>
         <const name="BLT_ALIAS" value="self"/>
-        <const name="BLT_MULTISITE_NAME" value="default,g"/>
+        <const name="BLT_MULTISITE_NAME" value="default"/>
     </php>
 
 </phpunit>
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,5 +18,5 @@ if [ -f $FILE ]; then @@
         fi
       fi
     else
-      echo "File $FILE does not exist."
+      echo "Notice: Slack notifications disabled: file $FILE does not exist."
     fi