- client: use [wfd] consistently

svn path=/trunk/boinc/; revision=19725
AenBleidd · Nov 27, 2009 · 6fc27ff · 6fc27ff
1 parent 781c914
commit 6fc27ff
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/checkin_notes b/checkin_notes
@@ -9546,3 +9546,9 @@ Charlie 26 Nov 2009
             MacAccessibility.cpp
     mac_installer/
         PostInstall.cpp
+
+David  27 Nov 2009
+    - client: use [wfd] consistently
+
+    client/
+        cs_scheduler.cpp
diff --git a/checkin_notes_2002 b/checkin_notes_2002
@@ -1,5 +1,3 @@
-;; -*- mode: text; tab-width: 4; indent-tabs-mode: nil; -*-
-
 David A.        April 10 2002
     Initial checkin of all files.
     The system is fairly feature-complete and

diff --git a/client/cs_scheduler.cpp b/client/cs_scheduler.cpp
@@ -1162,7 +1162,7 @@ PROJECT* CLIENT_STATE::find_project_with_overdue_results() {
 // 
 void CLIENT_STATE::request_work_fetch(const char* where) {
     if (log_flags.work_fetch_debug) {
-        msg_printf(0, MSG_INFO, "[work_fetch_debug] Request work fetch: %s", where);
+        msg_printf(0, MSG_INFO, "[wfd] Request work fetch: %s", where);
     }
     must_check_work_fetch = true;
 }

diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
@@ -747,8 +747,9 @@ void WORK_FETCH::compute_shares() {
 bool RSC_PROJECT_WORK_FETCH::debt_eligible(PROJECT* p, RSC_WORK_FETCH& rwf) {
     if (p->non_cpu_intensive) return false;
     if (p->suspended_via_gui) return false;
-    if (p->dont_request_more_work) return false;
     if (has_runnable_jobs) return true;
+        // must precede the done_request_more_work check
+    if (p->dont_request_more_work) return false;
     if (backoff_time > gstate.now) return false;
     if (prefs_prevent_fetch(p, rwf.rsc_type)) return false;
 

diff --git a/doc/boinc_news.php b/doc/boinc_news.php
@@ -1,6 +1,10 @@
 <?
 
 $project_news = array(
+array("November 27, 2009",
+    "An <a href=http://www.lanacion.com.ar/nota.asp?nota_id=1204531>article on
+    volunteer computing</a> appeared today in the Argentine newspaper <i>La Nacion</i>."
+),
 array("October 30, 2009",
     "The <a href=http://boinc.berkeley.edu/trac/wiki/WorkShop09>Fifth BOINC Workshop</a> was held Oct. 22-23 in Barcelona.
     There were 35 attendees and 21 excellent talks;

diff --git a/version.h b/version.h
@@ -23,7 +23,7 @@
 #define PACKAGE "boinc"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "[email protected]"
+#define PACKAGE_BUGREPORT ""
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "BOINC"