? patches ? platform/.backup.provision.inc.swp Index: provision.path.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/provision.path.inc,v retrieving revision 1.25 diff -u -r1.25 provision.path.inc --- provision.path.inc 1 Jul 2009 22:58:18 -0000 1.25 +++ provision.path.inc 24 Jul 2009 00:53:52 -0000 @@ -355,14 +355,21 @@ */ function _provision_chmod_recursive($path, $filemode) { if ( !is_dir($path) ) { - return chmod($path, $filemode); + $status = chmod($path, $filemode); } else { - $output = 0; - $cmd = sprintf("chmod -R %o %s", $filemode, $path); - system($cmd, $output); - return !$output; + if ($dh = opendir($path)) { + while (($file = readdir($dh)) !== false) { + if ($file != '.' && $file != '..') { + $status = _provision_chmod_recursive($path . "/" . $file); + } + } + closedir($dh); + } else { + $status = $dh; + } } + return $status; } /** Index: db_server/provision_mysql.drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/db_server/provision_mysql.drush.inc,v retrieving revision 1.20 diff -u -r1.20 provision_mysql.drush.inc --- db_server/provision_mysql.drush.inc 8 Jun 2009 21:15:15 -0000 1.20 +++ db_server/provision_mysql.drush.inc 24 Jul 2009 00:53:52 -0000 @@ -43,8 +43,8 @@ if (is_null($db_grant_host)) { $db_grant_host = _provision_mysql_grant_host( drush_get_option('db_host', ''), - drush_get_option('web_ip', null), - drush_get_option('web_host', 'localhost')); + drush_get_option('web_ip'), + drush_get_option('web_host')); } if (!_provision_mysql_create_database($db_name) || !_provision_mysql_database_exists($db_name) ) { @@ -53,6 +53,9 @@ return FALSE; } +drush_log(var_export(array('db_host' => drush_get_option('db_host', ''), 'web_ip' => drush_get_option('web_ip'), 'web_host' => drush_get_option('web_host')), true)); +drush_log(var_export(drush_get_context('options'), true)); + drush_log(dt("Granting privileges to %user@%client on %database", array('%user' => $db_user, '%client' => $db_grant_host, '%database' => $db_name))); if (!_provision_mysql_grant($db_name, $db_user, $db_passwd, $db_grant_host)) { drush_log("Could not GRANT user access.", 'warning'); } Index: platform/backup.provision.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/platform/backup.provision.inc,v retrieving revision 1.16 diff -u -r1.16 backup.provision.inc --- platform/backup.provision.inc 30 Jun 2009 01:28:53 -0000 1.16 +++ platform/backup.provision.inc 24 Jul 2009 00:53:52 -0000 @@ -11,7 +11,7 @@ */ function drush_provision_drupal_provision_backup_validate($url = NULL, $backup_file = NULL) { drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE); - if (!drush_get_option('installed')) { + if (!drush_get_option('installed') && !drush_get_option('force', false)) { drush_set_error('PROVISION_DRUPAL_SITE_NOT_FOUND'); } Index: platform/disable.provision.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/platform/disable.provision.inc,v retrieving revision 1.8 diff -u -r1.8 disable.provision.inc --- platform/disable.provision.inc 12 May 2009 21:31:08 -0000 1.8 +++ platform/disable.provision.inc 24 Jul 2009 00:53:52 -0000 @@ -9,17 +9,6 @@ */ /** - * Make sure the command we are running is on an installed site. - */ -function drush_provision_drupal_provision_disable_validate() { - drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE); - - if (!drush_get_option('installed')) { - drush_set_error('PROVISION_DRUPAL_SITE_FOUND'); - } -} - -/** * Make a backup of the site before we mess with it */ function drush_provision_drupal_pre_provision_disable($url, $backup_file = null) { Index: platform/migrate.provision.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/platform/migrate.provision.inc,v retrieving revision 1.10 diff -u -r1.10 migrate.provision.inc --- platform/migrate.provision.inc 7 May 2009 22:04:30 -0000 1.10 +++ platform/migrate.provision.inc 24 Jul 2009 00:53:52 -0000 @@ -45,7 +45,7 @@ * Switch the migrate directories around now that we have the new db installed */ function drush_provision_drupal_provision_migrate($url, $platform) { - drush_backend_invoke('provision deploy', array($url, drush_get_option('backup_file'), 'root' => $platform)); + drush_backend_invoke('provision deploy', array($url, drush_get_option('backup_file'), 'root' => $platform, 'web_host' => drush_get_option('web_host'), 'web_ip' => drush_get_option('web_ip'), 'db_host' => drush_get_option('db_host'))); }