From 7ac7bdcb0419371bfd830557570715a23cc48cab Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 17 Sep 2010 22:01:42 +0000
Subject: [PATCH] - scheduler: message tweak

svn path=/trunk/boinc/; revision=22384
---
 checkin_notes            |  7 +++++++
 sched/handle_request.cpp |  2 +-
 tools/create_work.cpp    | 25 ++++++++++++++++---------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 996826782d..8f9391a5ff 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6674,3 +6674,10 @@ David  16 Sept 2010
 	client/
 		client_msgs.cpp
 		cs_scheduler.cpp
+
+David  17 Sept 2010
+    - scheduler: message tweak
+    tools/
+        create_work.cpp
+    sched/
+        handle_request.cpp
diff --git a/sched/handle_request.cpp b/sched/handle_request.cpp
index 0907362af7..78c610c222 100644
--- a/sched/handle_request.cpp
+++ b/sched/handle_request.cpp
@@ -827,7 +827,7 @@ bool send_code_sign_key(char* code_sign_key) {
                     retval = read_file_malloc(path, signature);
                     if (retval) {
                         g_reply->insert_message(
-                           _("You may have an outdated code signing key.  Try attaching and reattaching this project."),
+                           _("The project has changed its security key.  Please remove and add this project."),
                            "notice"
                         );
                     } else {
diff --git a/tools/create_work.cpp b/tools/create_work.cpp
index 649bfa0ca5..69e9dbaba1 100644
--- a/tools/create_work.cpp
+++ b/tools/create_work.cpp
@@ -197,15 +197,22 @@ int main(int argc, const char** argv) {
         i++;
     }
 
-#define CHKARG(x,m) do { if (!(x)) { fprintf(stderr, "create_work: bad command line: "m"\n"); exit(1); } } while (0)
-#define CHKARG_STR(v,m) CHKARG(strlen(v),m)
-
-    CHKARG_STR(app.name             , "need --appname");
-    CHKARG_STR(wu.name              , "need --wu_name");
-    CHKARG_STR(wu_template_file     , "need --wu_template");
-    CHKARG_STR(result_template_file , "need --result_template");
-#undef CHKARG
-#undef CHKARG_STR
+    if (!strlen(app.name)) {
+        fprintf(stderr, "create_work: missing --appname\n");
+        exit(1);
+    }
+    if (!strlen(wu.name)) {
+        fprintf(stderr, "create_work: missing --wu_name\n");
+        exit(1);
+    }
+    if (!strlen(wu_template_file)) {
+        fprintf(stderr, "create_work: missing --wu_template\n");
+        exit(1);
+    }
+    if (!strlen(result_template_file)) {
+        fprintf(stderr, "create_work: missing --result_template\n");
+        exit(1);
+    }
 
     if (assign_flag) {
         if (!strstr(wu.name, ASSIGNED_WU_STR)) {