--- nagios.module.orig  2011-09-02 16:53:48.762645081 +0200
+++ nagios.module       2011-09-05 19:52:42.004471943 +0200
@@ -342,13 +342,9 @@
   $severity = REQUIREMENT_OK;
   foreach ($reqs as $key => $requirement) {
     if (isset($requirement['severity'])) {
-      // Ignore update_core warning if update cache has expired and nagios_cron_duration has not passed by yet
-      if ($key == 'update_core' && $requirement['severity'] == REQUIREMENT_WARNING && $requirement['reason'] == UPDATE_UNKNOWN) {
-        $grace = 60 * variable_get('nagios_cron_duration', 60);
-        $expire = db_query("SELECT expire FROM {cache_update} WHERE cid = :cid", array(':cid' => 'update_available_releases'))->fetchField();
-        if ($expire && REQUEST_TIME < ($expire + $grace)) {
-          continue;
-        }
+      // Ignore update_core warning if update check is pending
+      if (($key == 'update_core' || $key == 'update_contrib') && $requirement['severity'] == REQUIREMENT_ERROR && $requirement['reason'] == UPDATE_FETCH_PENDING) {
+        continue;
       }
       if ($requirement['severity'] > $severity) {
         $severity = $requirement['severity'];