Commit 5396e9eb authored by anarcat's avatar anarcat Committed by anarcat
Browse files

accept relative paths in migrate commands

more precisely: we resolve the publish_path so it's not relative, using
realpath()

without this, relative would end up in the apache config, breaking
vhosts
parent 55445810
...@@ -16,9 +16,7 @@ function drush_provision_hostmaster_migrate_validate($site, $platform) { ...@@ -16,9 +16,7 @@ function drush_provision_hostmaster_migrate_validate($site, $platform) {
} }
$data = drush_get_merged_options(); $data = drush_get_merged_options();
$data['root'] = $platform; $data['publish_path'] = $data['r'] = $data['root'] = realpath($platform);
$data['r'] = $platform;
$data['publish_path'] = $platform;
drush_backend_invoke('provision-verify', $data); drush_backend_invoke('provision-verify', $data);
// verify the current platform // verify the current platform
drush_backend_invoke('provision-verify', array('root' => drush_get_option(array('r', 'root'), drush_locate_root()))); drush_backend_invoke('provision-verify', array('root' => drush_get_option(array('r', 'root'), drush_locate_root())));
......
...@@ -26,7 +26,7 @@ function provision_apache_drush_init() { ...@@ -26,7 +26,7 @@ function provision_apache_drush_init() {
$path = drush_set_default('docroot_path', rtrim(($docroot) ? $docroot : $_SERVER['DOCUMENT_ROOT'], '/')); $path = drush_set_default('docroot_path', rtrim(($docroot) ? $docroot : $_SERVER['DOCUMENT_ROOT'], '/'));
drush_set_default('sites_path', $path . '/sites'); drush_set_default('sites_path', $path . '/sites');
drush_set_default('publish_path', drush_get_option('docroot_path')); drush_set_default('publish_path', realpath(drush_get_option('docroot_path')));
$parts = explode("/", $path); $parts = explode("/", $path);
array_pop($parts); array_pop($parts);
......
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