[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 35faf11f46d5d65218ba27bf8e456feb3a9e1b76
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 20:30:29 2011 +0200

    Del changes from upstream_sztaki_improveSchedStart.patch

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index c9dbccc..5af0af2 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -1259,56 +1259,3 @@ def builddir(*dirs):
                  sprintf(suffix, "%d", max_result_suffix+j+1);
                  const char *rtfpath = config.project_path("%s", wu_item.result_template_file);
                  int priority_increase = 0;
---- boinc-server-6.11.0+r18946.orig/sched/start
-+++ boinc-server-6.11.0+r18946/sched/start
-@@ -226,10 +226,19 @@
-     si = open(stdin, 'r')
-     if not stderr: stderr = stdout
-     se = open(stderr, 'a+', 0)
-+    try:
-+        # fchmod would be better, but that requires Python 2.6
-+        os.chmod(stderr, 0640)
-+    except OSError, e:
-+        pass
-     if stdout == stderr:
-         so = se
-     else:
-         so = open(stdout, 'a+')
-+        try:
-+            os.chmod(stdout, 0640)
-+        except OSError, e:
-+            pass
- 
-     # Redirect standard file descriptors.
-     os.dup2(si.fileno(), sys.stdin.fileno())
-@@ -328,12 +337,18 @@
- def lookup_task_run_state(task):
-     for run_state_task in run_state.tasks:
-         if run_state_task.cmd == task.cmd:
--            run_state_task.prunable = False
-+            if task.disabled:
-+                run_state_task.prunable = True
-+            else:
-+                run_state_task.prunable = False
-             return run_state_task
-     run_state_task = run_state.tasks.make_node_and_append('task')
-     run_state_task.cmd = task.cmd
-     run_state_task.last_run = 0
--    run_state_task.prunable = False
-+    if task.disabled:
-+        run_state_task.prunable = True
-+    else:
-+        run_state_task.prunable = False
-     return run_state_task
- 
- def interpret_period(str):
-@@ -450,7 +465,8 @@
-         return
-     for run_state_task in run_state.tasks:
-         if run_state_task.prunable:
--            print 'Deleting obsolete run_state task', run_state_task.cmd, '(last run %s)' %timestamp(float(run_state_task.last_run))
-+            if verbose:
-+                print 'Deleting obsolete run_state task', run_state_task.cmd, '(last run %s)' %timestamp(float(run_state_task.last_run))
-             run_state.tasks.remove_node(run_state_task)
- 
- def stop_daemon(pid):

-- 
BOINC packaging