? .drush-cache.info
? includes/table.inc
? includes/~drush.inc
Index: commands/core/field.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/core/field.drush.inc,v
retrieving revision 1.8
diff -u -p -r1.8 field.drush.inc
--- commands/core/field.drush.inc	27 Dec 2010 04:19:23 -0000	1.8
+++ commands/core/field.drush.inc	28 Dec 2010 04:08:56 -0000
@@ -145,7 +145,7 @@ function drush_field_delete($field_name)
     }
     else {
       if (!drush_confirm(dt('Do you want to delete the %field_name field?', array('%field_name' => $field_name)))) {
-        return drush_log(dt('Aborting.'));
+        return drush_set_user_abort();
       }
     }
   }
@@ -271,4 +271,4 @@ function drush_field_get_entity_from_bun
       }
     }
   }
-}
\ No newline at end of file
+}
Index: commands/core/search.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/core/search.drush.inc,v
retrieving revision 1.6
diff -u -p -r1.6 search.drush.inc
--- commands/core/search.drush.inc	2 Apr 2010 04:14:49 -0000	1.6
+++ commands/core/search.drush.inc	28 Dec 2010 04:08:56 -0000
@@ -38,7 +38,7 @@ function _drush_core_search_status() {
 function drush_core_search_index() {
   drush_print(dt("Building the index may take a long time."));
   if (!drush_confirm(dt('Do you really want to continue?'))) {
-    return drush_set_error('CORE_SEARCH_REBUILD_ABORT', 'Aborting.');
+    return drush_set_user_abort();
   }
   drush_op('_drush_core_search_index');
   drush_log(dt('The search index has been built.'), 'ok');
@@ -70,7 +70,7 @@ function drush_core_search_reindex() {
     drush_print(dt("Rebuilding the index may take a long time."));
   }
   if (!drush_confirm(dt('Do you really want to continue?'))) {
-    return drush_set_error('CORE_SEARCH_REINDEX_ABORT', 'Aborting.');
+    return drush_set_user_abort();
   }
 
   if (drush_drupal_major_version() >= 7) {
Index: commands/core/site_install.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/core/site_install.drush.inc,v
retrieving revision 1.17
diff -u -p -r1.17 site_install.drush.inc
--- commands/core/site_install.drush.inc	23 Dec 2010 02:07:49 -0000	1.17
+++ commands/core/site_install.drush.inc	28 Dec 2010 04:08:56 -0000
@@ -27,7 +27,7 @@ function drush_core_pre_site_install() {
   $msg[] = dt("DROP your '@db' database and then CREATE a new one.", array('@db' => $db_spec['database']));
 
   if (!drush_confirm(dt('You are about to ') . implode(dt(' and '), $msg) . ' Do you want to continue?')) {
-    return drush_set_error('CORE_SITE_INSTALL_ABORT', 'Aborting.');
+    return drush_set_user_abort();
   }
 
   // Can't install without sites directory and settings.php.
Index: commands/core/watchdog.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/core/watchdog.drush.inc,v
retrieving revision 1.14
diff -u -p -r1.14 watchdog.drush.inc
--- commands/core/watchdog.drush.inc	24 Nov 2010 07:50:35 -0000	1.14
+++ commands/core/watchdog.drush.inc	28 Dec 2010 04:08:56 -0000
@@ -85,7 +85,7 @@ function drush_core_watchdog_list() {
   }
   $option = drush_choice($options, dt('Select a message type or severity level.'));
   if ($option === FALSE) {
-    return drush_log(dt('Aborting.'));
+    return drush_set_user_abort();
   }
   $ntypes = count($types);
   if ($option < $ntypes) {
@@ -144,7 +144,7 @@ function drush_core_watchdog_show_many($
 
   $where = core_watchdog_query($type, $severity, $filter);
   if ($where === FALSE) {
-    return drush_log(dt('Aborting.'));
+    return drush_set_error(dt('Aborting.'));
   }
   $rsc = drush_db_select('watchdog', '*', $where['where'], $where['args'], 0, $count, 'wid', 'DESC');
   if ($rsc === FALSE) {
@@ -289,11 +289,12 @@ function drush_core_watchdog_delete($arg
     }
     $where = core_watchdog_query($type, $severity, $arg, 'OR');
     if ($where === FALSE) {
+      // Drush set error was already called by core_watchdog_query
       return drush_log(dt('Aborting.'), 'error');
     }
     drush_print(dt('All messages with !where will be deleted.', array('!where' => preg_replace("/message LIKE %$arg%/", "message body containing '$arg'" , strtr($where['where'], $where['args'])))));
     if(!drush_confirm(dt('Do you really want to continue?'))) {
-      return drush_log(dt('Aborting.'));
+      return drush_set_user_abort();
     }
     $affected_rows = drush_db_delete('watchdog', $where['where'], $where['args']);
     drush_log(dt('!affected_rows watchdog messages have been deleted.', array('!affected_rows' => $affected_rows)), 'ok');
@@ -321,7 +322,7 @@ function core_watchdog_query($type = NUL
     $types = core_watchdog_message_types();
     if (array_search($type, $types) === FALSE) {
       $msg = "Unrecognized message type: !type.\nRecognized types are: !types.";
-      return drush_set_error(dt($msg, array('!type' => $type, '!types' => implode(', ', $types))));
+      return drush_set_error('WATCHDOG_UNRECOGNIZED_TYPE', dt($msg, array('!type' => $type, '!types' => implode(', ', $types))));
     }
     $conditions[] = "type = :type";
     $args[':type'] = $type;
Index: commands/pm/pm.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/pm/pm.drush.inc,v
retrieving revision 1.186
diff -u -p -r1.186 pm.drush.inc
--- commands/pm/pm.drush.inc	27 Dec 2010 15:46:16 -0000	1.186
+++ commands/pm/pm.drush.inc	28 Dec 2010 04:08:58 -0000
@@ -598,7 +598,7 @@ function drush_pm_enable() {
   else {
     drush_print(dt('The following extensions will be enabled: !extensions', array('!extensions' => implode(', ', $extensions))));
     if(!drush_confirm(dt('Do you really want to continue?'))) {
-      return drush_log(dt('Aborting.'));
+      return drush_set_user_abort();
     }
   }
 
@@ -712,7 +712,7 @@ function drush_pm_disable() {
   else {
     drush_print(dt('The following extensions will be disabled: !extensions', array('!extensions' => implode(', ', $extensions))));
     if(!drush_confirm(dt('Do you really want to continue?'))) {
-      return drush_log(dt('Aborting.'));
+      return drush_set_user_abort();
     }
   }
 
@@ -951,7 +951,7 @@ function drush_pm_uninstall() {
   else {
     drush_print(dt('The following modules will be uninstalled: !modules', array('!modules' => implode(', ', $modules))));
     if(!drush_confirm(dt('Do you really want to continue?'))) {
-      return drush_log(dt('Aborting.'));
+      return drush_set_user_abort();
     }
   }
 
@@ -2155,7 +2155,7 @@ function drush_pm_download() {
     // Check if install location already exists.
     if (is_dir($request['project_install_location'])) {
       if (!drush_confirm(dt('Install location !location already exists. Do you want to overwrite it?', array('!location' => $request['project_install_location'])))) {
-        drush_log(dt("Abort installation of !project to !dest.", array('!project' => $request['name'], '!dest' => $request['project_install_location'])), 'warning');
+        drush_log(dt("Skip installation of !project to !dest.", array('!project' => $request['name'], '!dest' => $request['project_install_location'])), 'warning');
         continue;
       }
     }
Index: includes/command.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/command.inc,v
retrieving revision 1.100
diff -u -p -r1.100 command.inc
--- includes/command.inc	27 Dec 2010 03:33:33 -0000	1.100
+++ includes/command.inc	28 Dec 2010 04:08:59 -0000
@@ -143,7 +143,7 @@ function drush_invoke($command) {
       if (function_exists($rb_func)) {
         call_user_func_array($rb_func, $args);
         _drush_log_drupal_messages();
-        drush_log("Changes for $func module have been rolled back.", 'rollback');
+        drush_log(dt("Changes for $func module have been rolled back."), 'rollback');
       }
     }
   }
Index: includes/drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/drush.inc,v
retrieving revision 1.178
diff -u -p -r1.178 drush.inc
--- includes/drush.inc	27 Dec 2010 03:33:33 -0000	1.178
+++ includes/drush.inc	28 Dec 2010 04:09:00 -0000
@@ -336,7 +336,19 @@ function drush_die($msg = NULL, $status 
 }
 
 /**
+ * Call drush_set_error with DRUSH_USER_ABORT.
+ *
+ * Usage: return drush_set_user_abort();
+ */
+function drush_set_user_abort() {
+  drush_set_context('DRUSH_USER_ABORT', TRUE);
+  return drush_set_error('DRUSH_USER_ABORT', dt('Aborting.'));
+}
+
+/**
  * Exit due to user declining a confirmation prompt.
+ * It is preferable to use `return drush_set_user_abort();`
+ * instead of this routine.
  */
 function drush_user_abort($msg = NULL, $status = NULL) {
   drush_set_context('DRUSH_USER_ABORT', TRUE);