Commit 330721d0 authored by anarcat's avatar anarcat Committed by anarcat

#946422 - do not use relative mode, it breaks symlinks

parent e0d0b397
......@@ -441,7 +441,6 @@ class provisionServer extends provisionEnvironment {
if (provision_file()->exists($path)->status()) {
$options = array_merge(array(
'relative' => TRUE,
'omit-dir-times' => TRUE,
), $additional_options);
......@@ -452,7 +451,9 @@ class provisionServer extends provisionEnvironment {
$options['delete'] = TRUE;
}
if (drush_core_call_rsync(escapeshellarg($path), escapeshellarg($this->script_user . '@' . $this->remote_host . ':/'), $options, TRUE, FALSE)) {
// XXX: we assume the same directory prefix on remote
$dir = dirname($path);
if (drush_core_call_rsync(escapeshellarg($path), escapeshellarg($this->script_user . '@' . $this->remote_host . ':' . $dir), $options, TRUE, FALSE)) {
drush_log(dt('@path has been synced to remote server @remote_host.', array('@path' => $path, '@remote_host' => $this->remote_host)));
}
else {
......
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