[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-414-geec4d18

Steffen Moeller moeller at debian.org
Wed Mar 14 22:37:44 UTC 2012


The following commit has been merged in the master branch:
commit 58583fe94bb80cc869ee300398d7b016f17383aa
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Mar 9 14:31:56 2012 +0100

    More verbosity upon error on startup.

diff --git a/debian/patches/MoreInformativeAppStartFailure.patch b/debian/patches/MoreInformativeAppStartFailure.patch
new file mode 100644
index 0000000..0a339a4
--- /dev/null
+++ b/debian/patches/MoreInformativeAppStartFailure.patch
@@ -0,0 +1,49 @@
+Index: boinc/client/app_start.cpp
+===================================================================
+--- boinc.orig/client/app_start.cpp	2012-03-09 14:16:53.000000000 +0100
++++ boinc/client/app_start.cpp	2012-03-09 14:31:40.000000000 +0100
+@@ -320,7 +320,10 @@
+         strcat(dir_path, "/");
+         strcat(dir_path, p);
+         retval = boinc_mkdir(dir_path);
+-        if (retval) return retval;
++        if (retval) {
++            fprintf(stderr,"create_dirs_for_logical_name: could not create dir '%s'.\n",dir_path);
++            return retval;
++        }
+         p = q+1;
+     }
+     return 0;
+@@ -1003,6 +1006,9 @@
+ #endif
+         }
+         sprintf(buf, "../../%s", exec_path);
++
++        char errorMsg[8000];
++        strcpy(errorMsg,"execv: ");
+         if (g_use_sandbox) {
+             char switcher_path[100];
+             sprintf(switcher_path, "../../%s/%s",
+@@ -1020,17 +1026,21 @@
+             // so they must be world-readable so BOINC CLient can read them
+             //
+             umask(2);
++            strcat(errorMsg," switcher_path:");
++            strcat(errorMsg,switcher_path);
+             retval = execv(switcher_path, argv);
+         } else {
+             argv[0] = buf;
+             parse_command_line(cmdline, argv+1);
+             retval = execv(buf, argv);
+         }
++        strcat(errorMsg,buf);
+         msg_printf(wup->project, MSG_INTERNAL_ERROR,
+             "Process creation (%s) failed: %s, errno=%d\n",
+             buf, boincerror(retval), errno
+         );
+-        perror("execv");
++
++        perror(errorMsg);
+         fflush(NULL);
+         _exit(errno);
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 37ef489..2ef0795 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ cwd_handling.patch
 sched_vda_strncpy.patch
 parse_issues.patch
 client_stream_realloc.patch
+MoreInformativeAppStartFailure.patch

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list