summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Beaupré2010-11-17 21:13:39 (GMT)
committeranarcat2010-11-17 21:13:39 (GMT)
commitd4339f9f3d82d870ae90e4b2c28e823238ec8f8f (patch)
tree83dbc6e1ab3616388e128518b92eba302b813d02
parentd704dcd85fdc14b744ec3e4bac711f9268e4fc83 (diff)
parent050f3a759c8ddee10fba1f733c54d6329235b593 (diff)
Merge remote branch 'hostmaster/master'
-rw-r--r--install.hostmaster.inc7
-rw-r--r--platform/verify.provision.inc7
2 files changed, 12 insertions, 2 deletions
diff --git a/install.hostmaster.inc b/install.hostmaster.inc
index 927b05e..7e8732f 100644
--- a/install.hostmaster.inc
+++ b/install.hostmaster.inc
@@ -151,7 +151,12 @@ function drush_provision_hostmaster_install($site = NULL) {
'root' => $platform,
'makefile' => drush_get_option('makefile'),
));
- provision_backend_invoke($platform_name, 'provision-verify');
+ // propagate working-copy args downward
+ $options = array();
+ if (drush_get_option('working-copy')) {
+ $options['working-copy'] = 1;
+ }
+ provision_backend_invoke($platform_name, 'provision-verify', array(), $options);
// exit if an error has occured.
if (drush_get_error()) {
diff --git a/platform/verify.provision.inc b/platform/verify.provision.inc
index ab63dc7..01c4489 100644
--- a/platform/verify.provision.inc
+++ b/platform/verify.provision.inc
@@ -47,7 +47,12 @@ function drush_provision_drupal_pre_provision_verify() {
// create a platform from a makefile, if it doesnt already exist and the makefile does.
if (!provision_file()->exists(d()->root)->status() && !empty(d()->makefile)) {
drush_log(dt("Platform path does not exists, fetching from drush makefile"));
- drush_backend_invoke("make", array(d()->makefile, d()->root), array('root' => null, 'uri' => null));
+ $options = array('root' => null, 'uri' => null);
+ // propagate working-copy args downward
+ if (drush_get_option('working-copy')) {
+ $options['working-copy'] = 1;
+ }
+ drush_backend_invoke("make", array(d()->makefile, d()->root), $options);
if (drush_get_error()) {
return drush_set_error("DRUSH_MAKE_FAILED",
"Could not download platform using drush make. No platform present");