Commit edf9e66c authored by anarcat's avatar anarcat Committed by anarcat

Revert "do not use relative mode, it breaks symlinks"

This actually breaks a lot more stuff, because we assume rsync is going to create all directories for us, and it doesn't without --relative

This reverts commit 9054df70bb822bbce36b74dc4b94d91a4a7f9ba7.
parent 72f09e4b
......@@ -170,6 +170,7 @@ class provisionContext_server extends provisionContext {
if (provision_file()->exists($path)->status()) {
$options = array_merge(array(
'relative' => TRUE,
'omit-dir-times' => TRUE,
'delete' => TRUE,
), $additional_options);
......@@ -182,9 +183,7 @@ class provisionContext_server extends provisionContext {
$options['delete'] = TRUE;
}
// 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)) {
if (drush_core_call_rsync(escapeshellarg($path), escapeshellarg($this->script_user . '@' . $this->remote_host . ':/'), $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