Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Fixed features override test. #1010

Merged
merged 1 commit into from
Jan 25, 2017
Merged

Fixed features override test. #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion phing/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ drupal:

drush:
bin: ${composer.bin}/drush
cmd: ${drush.bin} @${drush.alias} -r ${docroot} -l ${multisite.name}
cmd: ${drush.bin} @${drush.alias} -l ${multisite.name}
dir: ${docroot}
uri: ${multisite.name}
assume: yes
Expand Down
3 changes: 2 additions & 1 deletion phing/tasks/setup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,8 @@
<if>
<equals arg1="${cm.features.no-overrides}" arg2="true"/>
<then>
<exec command="${drush.bin} @${drush.alias} fl --bundle=${bundle} | grep -Ei '(changed|conflicts|added)( *)$'" outputProperty="features.overrides"/>
<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>
Expand Down