Index: mailchimp.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/Attic/mailchimp.install,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 mailchimp.install
--- mailchimp.install	18 May 2010 04:34:43 -0000	1.1.2.6
+++ mailchimp.install	4 Jun 2010 12:17:56 -0000
@@ -65,20 +65,21 @@ function mailchimp_update_6202() {
   module_load_include('php', 'mailchimp', 'MCAPI.class');
 
   $q = new MCAPI(variable_get('mailchimp_username', ''), variable_get('mailchimp_password', ''));
-  // set the timeout to something reasonsable to avoid taking down the Drupal site
+  // Set the timeout to something reasonsable to avoid taking down the site.
   $q->setTimeout(60);
   
   if ($q->errorCode) {
-    watchdog('mailchimp', $q->errorMessage, array(), WATCHDOG_ERROR);
-    // TODO: Notify persons that finding an API Key for a seamless upgrade failed because we could not login.
+    watchdog('mailchimp', $q->errorMessage, NULL, WATCHDOG_ERROR);
+    $ret[] = array('success' => FALSE, 'query' => 'MailChimp returned error: ' . check_plain($q->errorMessage));
     return $ret;
   }
   
-  // Save an API key to the site's variables
+  // Save the API key.
   variable_set('mailchimp_api_key', $q->api_key);
   
-  // clean up old variables
-  $ret[] = update_sql("DELETE FROM {variable} WHERE name = 'mailchimp_username' OR name = 'mailchimp_password'");
+  // Clean up old variables.
+  variable_del('mailchimp_username');
+  variable_del('mailchimp_password');
   return $ret;
 }
 
Index: mailchimp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/mailchimp.module,v
retrieving revision 1.2.2.1.2.3.2.8.2.56
diff -u -p -r1.2.2.1.2.3.2.8.2.56 mailchimp.module
--- mailchimp.module	20 May 2010 23:30:38 -0000	1.2.2.1.2.3.2.8.2.56
+++ mailchimp.module	4 Jun 2010 12:01:06 -0000
@@ -92,7 +92,7 @@ function mailchimp_user($op, &$edit, &$a
               array('%email' => $account->mail, '%list' => $list->name, '%action' => $op), WATCHDOG_NOTICE);
         }
         else {
-          watchdog('mailchimp', $q->errorMessage, array(), WATCHDOG_ERROR);
+          watchdog('mailchimp', $q->errorMessage, NULL, WATCHDOG_ERROR);
         }
       }
     }
@@ -251,7 +251,7 @@ function mailchimp_subscribe_auth_form_s
         }
 
         if (!$ret) {
-          watchdog('mailchimp', $q->errorMessage, array(), WATCHDOG_ERROR);
+          watchdog('mailchimp', $q->errorMessage, NULL, WATCHDOG_ERROR);
         }
       }
     }
@@ -297,7 +297,7 @@ function mailchimp_cron() {
           $ret = $q->listBatchSubscribe($list->id, $lists[$key]->batch, FALSE, TRUE);
           if ($ret['error_count'] > 0) {
             foreach ((array)$ret['errors'] as $error) {
-              watchdog('mailchimp', $error['message'], array(), WATCHDOG_ERROR);
+              watchdog('mailchimp', $error['message'], NULL, WATCHDOG_ERROR);
             }
           }
         }
@@ -1095,7 +1095,7 @@ function _mailchimp_get_api_object() {
   $q->setTimeout(60);
   
   if ($q->errorCode) {
-    watchdog('mailchimp', $q->errorMessage, array(), WATCHDOG_ERROR);
+    watchdog('mailchimp', $q->errorMessage, NULL, WATCHDOG_ERROR);
     return NULL;
   }
   return $q;