Skip to content

Commit

Permalink
The Drupal 7 install.core.inc writes it's own configuration file, and…
Browse files Browse the repository at this point in the history
… doesn't expect to be in a configuration bootstrapped state (as Drupal 6 did). Trying to bootstrap configuration with no configuration file causes issues with commands that come later in the request (e.g. quick-drupal), since DRUSH_DB_CREDENTIALS is left empty even though there should be usable credentials.
  • Loading branch information
grugnog committed Sep 26, 2011
1 parent 4d57d20 commit aa39a83
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions commands/core/site_install.drush.inc
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ function drush_core_pre_site_install($profile = NULL) {
$install_profile_config = "\$conf['install_profile'] = '$profile';";
file_put_contents($settingsfile, "\n" . $install_profile_config . "\n", FILE_APPEND);
}
// The Drupal 6 installer needs to bootstrap up to the specified site.
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_CONFIGURATION);
}
}

Expand All @@ -102,9 +104,6 @@ function drush_core_pre_site_install($profile = NULL) {
}
}

// Now we can bootstrap up to the specified site.
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_CONFIGURATION);

// Empty or create the DB as needed.
$db_name = $db_spec['database'];
$scheme = _drush_sql_get_scheme($db_spec);
Expand Down

0 comments on commit aa39a83

Please sign in to comment.