From 969100a00ca13ec094dfa88026116ed0aaeb793c Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 16 Jul 2010 18:38:14 +0000
Subject: [PATCH] - feeder: error out if an ordering option (e.g. --priority)  
   is used in combination with homogeneous redundancy.     HR requires a
 cyclic scan of all sendable results.

svn path=/trunk/boinc/; revision=21973
---
 checkin_notes         | 10 ++++++++++
 sched/feeder.cpp      |  8 ++++++++
 tools/backend_lib.cpp |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index bb6f0c3a15..7bab08fea0 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5202,3 +5202,13 @@ Charlie 16 Jul 2010
 
     clientgui/
         DlgEventLog.cpp, .h
+
+David  16 Jul 2010
+    - feeder: error out if an ordering option (e.g. --priority)
+        is used in combination with homogeneous redundancy.
+        HR requires a cyclic scan of all sendable results.
+
+    sched/
+        feeder.cpp
+    tools/
+        backend_lib.cpp
diff --git a/sched/feeder.cpp b/sched/feeder.cpp
index 0c43c4e7af..027bd1a257 100644
--- a/sched/feeder.cpp
+++ b/sched/feeder.cpp
@@ -856,6 +856,14 @@ int main(int argc, char** argv) {
     }
 
     hr_init();
+
+    if (using_hr && strlen(order_clause)) {
+        log_messages.printf(MSG_CRITICAL,
+            "Can't use ordering options together with homogeneous redundancy\n"
+        );
+        exit(1);
+    }
+
     if (config.job_size_matching) {
         retval = ssp->perf_info.read_file();
         if (retval) {
diff --git a/tools/backend_lib.cpp b/tools/backend_lib.cpp
index 20249f5761..e9949bb0c4 100644
--- a/tools/backend_lib.cpp
+++ b/tools/backend_lib.cpp
@@ -460,7 +460,7 @@ int create_result(
 
     result.clear();
     initialize_result(result, wu);
-    result.priority = result.priority + priority_increase;
+    result.priority += priority_increase;
     sprintf(result.name, "%s_%s", wu.name, result_name_suffix);
     sprintf(base_outfile_name, "%s_", result.name);
     retval = read_filename(