[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-329-g489f040

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 0c736842c2ac56825baba544c5c87cb0a22ca786
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 20:57:50 2011 +0200

    Transitioner work was already included upstream

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 5af0af2..a09dd7b 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -1204,58 +1204,3 @@ def builddir(*dirs):
          } 
      } 
  
---- boinc-server-6.11.0+r18946.orig/sched/transitioner.cpp
-+++ boinc-server-6.11.0+r18946/sched/transitioner.cpp
-@@ -301,7 +301,28 @@
-         );
-         wu_item.error_mask |= WU_ERROR_TOO_MANY_ERROR_RESULTS;
-     }
--    if ((int)items.size() > wu_item.max_total_results) {
-+
-+    // see how many new results we need to make
-+    //
-+    int n_new_results_needed = wu_item.target_nresults - nunsent - ninprogress - nsuccess;
-+    if (n_new_results_needed < 0) n_new_results_needed = 0;
-+    int n_new_results_allowed = wu_item.max_total_results - (int)items.size();
-+
-+    // if we're already at the limit and need more, error out the WU
-+    //
-+    bool too_many = false;
-+    if (n_new_results_allowed < 0) {
-+        too_many = true;
-+    } else if (n_new_results_allowed == 0) {
-+        if (n_new_results_needed > 0) {
-+            too_many = true;
-+        }
-+    } else {
-+        if (n_new_results_needed > n_new_results_allowed) {
-+            n_new_results_needed = n_new_results_allowed;
-+        }
-+    }
-+    if (too_many) {
-         log_messages.printf(MSG_NORMAL,
-             "[WU#%d %s] WU has too many total results (%d)\n",
-             wu_item.id, wu_item.name, (int)items.size()
-@@ -360,18 +381,17 @@
-     } else if (wu_item.canonical_resultid == 0) {
-         // Here if no WU-level error.
-         // Generate new results if needed.
--        // NOTE: n must be signed
-         //
--        int n = wu_item.target_nresults - nunsent - ninprogress - nsuccess;
-         std::string values;
-         char value_buf[MAX_QUERY_LEN];
--        if (n > 0) {
-+        if (n_new_results_needed > 0) {
-             log_messages.printf(
-                 MSG_NORMAL,
-                 "[WU#%d %s] Generating %d more results (%d target - %d unsent - %d in progress - %d success)\n",
--                wu_item.id, wu_item.name, n, wu_item.target_nresults, nunsent, ninprogress, nsuccess
-+                wu_item.id, wu_item.name, n_new_results_needed,
-+                wu_item.target_nresults, nunsent, ninprogress, nsuccess
-             );
--            for (j=0; j<n; j++) {
-+            for (j=0; j<n_new_results_needed; j++) {
-                 sprintf(suffix, "%d", max_result_suffix+j+1);
-                 const char *rtfpath = config.project_path("%s", wu_item.result_template_file);
-                 int priority_increase = 0;
diff --git a/debian/patches/local_sztaki_workOnTransitioner.patch b/debian/patches/local_sztaki_workOnTransitioner.patch
new file mode 100644
index 0000000..88050c4
--- /dev/null
+++ b/debian/patches/local_sztaki_workOnTransitioner.patch
@@ -0,0 +1,16 @@
+Disclaimer: The patches from SZTAKI seem to already have been applied,
+ except for this difference.
+Index: boinc/sched/transitioner.cpp
+===================================================================
+--- boinc.orig/sched/transitioner.cpp	2011-06-13 20:32:42.000000000 +0200
++++ boinc/sched/transitioner.cpp	2011-06-13 20:37:45.000000000 +0200
+@@ -355,7 +355,8 @@
+     //
+     int n_new_results_needed = wu_item.target_nresults - nunsent - ninprogress - nsuccess;
+     if (n_new_results_needed < 0) n_new_results_needed = 0;
+-    int n_new_results_allowed = wu_item.max_total_results - ntotal;
++    int n_new_results_allowed = wu_item.max_total_results - ntotal; // orig
++    //int n_new_results_allowed = wu_item.max_total_results - (int)items.size(); //SZTAKI FIXME: review difference
+ 
+     // if we're already at the limit and need more, error out the WU
+     //
diff --git a/debian/patches/series b/debian/patches/series
index 12b2e30..af98fcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+local_sztaki_workOnTransitioner.patch
 debian_sztaki_httpdUserIsWwwData.patch
 upstream_sztaki_improveSchedStart.patch
 local_sztaki_toolsUpgradeSimplification.patch

-- 
BOINC packaging