? .svn
? drushrc.php
? update_status
? z
? commands/core/batch.drush.inc
? includes/table.inc
Index: includes/sitealias.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/sitealias.inc,v
retrieving revision 1.17
diff -u -r1.17 sitealias.inc
--- includes/sitealias.inc	1 Feb 2010 16:51:11 -0000	1.17
+++ includes/sitealias.inc	19 Feb 2010 17:30:09 -0000
@@ -177,17 +177,8 @@
   // If the alias record does not have a defined 'databases' entry,
   // then we'll need to look one up
   if (!isset($alias_record['db-url']) && !isset($alias_record['databases']) && !isset($alias_record['site-list'])) {
-    // If the alias record is remote, then we'll use backend_invoke to fetch the
-    // database settings from the remote machine
-    if (array_key_exists('remote-host', $alias_record)) {
-      $values = drush_do_site_command($alias_record, "sql-conf", array(), array('all' => TRUE));
-      $alias_record['databases'] = $values['object'];
-    }
-    // If the alias record is for a local machine, then look up and
-    // use the database settings from the appropriate settings.php file.
-    else {
-      $alias_record = array_merge(_drush_sitealias_build_record_from_settings($alias_record['uri'], $alias_record['root']), $alias_record);
-    }
+    $values = drush_do_site_command($alias_record, "sql-conf", array(), array('all' => TRUE));
+    $alias_record['databases'] = $values['object'];
   }
 }
 
@@ -673,13 +664,6 @@
     global $databases, $db_url, $base_url;
     $base_url = null;
     require $site_settings_file;
-    if (isset($db_url)) {
-      $alias_record['db-url'] = $db_url;
-    }
-    else {
-      $alias_record['databases'] = $databases;
-    }
-
     $alias_record['root'] = $drupal_root;
     if (isset($alias)) {
       $alias_record['uri'] = $alias;