Commit 4595fb9e authored by omega8cc's avatar omega8cc

Merge branch '6.x-1.x' of git.drupal.org:project/provision into dev-nginx-6.x-1.x

parents aafe175f 72c97aa8
......@@ -24,6 +24,9 @@ function drush_provision_drupal_provision_delete() {
// if redirection is enabled, keep silent about errors
_provision_drupal_delete_aliases();
// Remove the symlink in the clients directory.
_provision_client_delete_symlink();
provision_drupal_sync_site();
}
elseif (d()->type === 'platform') {
......
......@@ -494,6 +494,8 @@ function provision_find_packages() {
$packages['base'] = _provision_find_packages('base');
$packages['sites-all'] = _provision_find_packages('sites', 'all');
// Create a package for the Drupal release
$packages['base']['platforms'] = _provision_find_platforms();
......@@ -612,7 +614,6 @@ function _provision_drupal_search_paths($scope, $key = '', $type = 'modules') {
switch ($scope) {
case 'base' :
$searchpaths[] = sprintf("%s/%s", $drupal_root, $type);
$searchpaths[] = sprintf("%s/sites/all/%s", $drupal_root, $type);
break;
default :
if ($key) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment