? conf_overriden_in_the_wrong_place.patch
? drushrc.php
? nbproject
? includes/table.inc
Index: includes/context.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/context.inc,v
retrieving revision 1.8
diff -w -u -p -r1.8 context.inc
--- includes/context.inc	24 May 2009 18:42:09 -0000	1.8
+++ includes/context.inc	15 Sep 2009 21:12:05 -0000
@@ -109,7 +109,7 @@ function _drush_config_file($context) {
  * Load drushrc files (if available) from several possible locations.
  */
 function drush_load_config($context) {
-  global $conf;
+  global $drush_conf_override;
 
   $config = _drush_config_file($context);
   if (file_exists($config)) {
@@ -119,7 +119,7 @@ function drush_load_config($context) {
     
     // Instruct core not to queries since we are not outputting them.
     // This can be overridden by a command or a drushrc file if needed.
-    $conf['dev_query'] = FALSE;
+    $drush_conf_override['dev_query'] = FALSE;
 
     /**
      * Allow the drushrc.php file to override $conf settings.
@@ -128,7 +128,7 @@ function drush_load_config($context) {
      * and changes in settings.php would wipe out the drushrc.php settings.
      */
     if (!empty($override)) {
-      $conf = array_merge($conf, $override);
+      $drush_conf_override = array_merge($drush_conf_override, $override);
     }
   }
 }
Index: includes/environment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/environment.inc,v
retrieving revision 1.40
diff -w -u -p -r1.40 environment.inc
--- includes/environment.inc	19 Aug 2009 02:33:57 -0000	1.40
+++ includes/environment.inc	15 Sep 2009 21:12:06 -0000
@@ -561,8 +561,14 @@ function _drush_bootstrap_drupal_site() 
  * and access them easily in the future.
  */
 function _drush_bootstrap_drupal_configuration() {
+  global $conf, $drush_conf_override;
+  
   drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
 
+  // Overriding the $conf array from drupal CONFIGURATION bootstrap with the
+  // overrides we collected on the loaded config files on DRUSH_BOOTSTRAP_DRUSH
+  $conf = is_array($conf) ? array_merge($conf, $drush_conf_override) : $drush_conf_override;
+
   // Populate the DRUSH_DB_CREDENTIALS with the fields loaded from the configuration.
   $creds = array();
   switch (drush_drupal_major_version()) {