rename of file directories failed on deploy.

platform/clone.provision.inc

@@ -52,7 +52,7 @@ function drush_provision_drupal_provision_clone($new_uri, $platform = null) {
   drush_backend_invoke_args('provision-save', array($new_uri), $options);
   # note that we reset the aliases so they don't conflict with the original site
 
-  provision_backend_invoke($new_uri, 'provision-deploy', array(drush_get_option('backup_file')));
+  provision_backend_invoke($new_uri, 'provision-deploy', array(drush_get_option('backup_file')), array('old_uri' => d()->uri));
 
   if (!drush_get_error()) {
     provision_backend_invoke($new_uri, 'provision-verify');

platform/drupal/deploy.inc

 <?php
 // $Id$
 
-$new_url = drush_get_option('uri');
-$old_url = drush_get_option('uri', '', 'site');
+$new_url = d()->uri;
+$old_url = drush_get_option('old_uri', $new_url, 'options');
 
 /**
  * @file

platform/migrate.provision.inc

@@ -77,7 +77,7 @@ function drush_provision_drupal_provision_migrate($platform, $new_uri = null) {
   }
 
   drush_backend_invoke_args('provision-save', array($target), $options);
-  provision_backend_invoke($target, 'provision-deploy', array(drush_get_option('backup_file')));
+  provision_backend_invoke($target, 'provision-deploy', array(drush_get_option('backup_file')), array('old_uri' => d()->uri));
   if (!drush_get_error()) {
     provision_backend_invoke($target, 'provision-verify');
   }

platform/restore.provision.inc

@@ -36,7 +36,7 @@ function drush_provision_drupal_pre_provision_restore_rollback($restore_file) {
  */
 function drush_provision_drupal_provision_restore($restore_file) {
 
-  provision_backend_invoke(d()->name, 'provision-deploy', array(drush_get_option('restore_file')));
+  provision_backend_invoke(d()->name, 'provision-deploy', array(drush_get_option('restore_file')), array('old_uri' => d()->uri));
   if (!drush_get_error()) {
     provision_backend_invoke(d()->name, 'provision-verify');
     drush_set_option('installed', false);