Index: date/date.install
===================================================================
RCS file: /cvs/drupal/contributions/modules/date/date/date.install,v
retrieving revision 1.37.2.5.2.31
diff -u -p -r1.37.2.5.2.31 date.install
--- date/date.install	8 Jun 2009 22:42:27 -0000	1.37.2.5.2.31
+++ date/date.install	30 Jul 2009 15:52:25 -0000
@@ -531,7 +531,7 @@ function date_update_6005() {
   // We need to abort and tell the user to re-run it.
   // We need a custom abort process because the content_check_update could be OK
   // but we still need to update these values.
-  if (!db_table_exists('date_format') || !db_table_exists('date_format_types')) {
+  if ((!db_table_exists('date_format') && !db_table_exists('date_formats')) || !db_table_exists('date_format_types')) {
     drupal_set_message(t('Some updates are still pending. Please return to <a href="@update-php">update.php</a> and run the remaining updates.', array('@update-php' => base_path() .'update.php?op=selection')), 'error', FALSE);
     $ret['#abort'] = array('success' => FALSE, 'query' => t('Some updates are still pending.<br/>Please re-run the update script.'));
     return $ret;
@@ -788,4 +788,4 @@ function date_db_integrity($name) {
   }
   content_clear_type_cache();
   return $ret;
-}
\ No newline at end of file
+}