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

[Steffen Moeller]

The following commit has been merged in the SZTAKI branch:
commit 89748cb241b8cc12374054c5b2fd15a66aa36e01
Author: Steffen Moeller <moeller at debian.org>
Date:   Mon Jun 13 14:23:32 2011 +0200

    Improvement to start of scheduler.

diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 56d6505..6b16244 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -891,25 +891,6 @@ def builddir(*dirs):
  ## other stuff to go into the distribution
 -EXTRA_DIST = constraints.sql schema.sql init_db
 +EXTRA_DIST = init_db
---- boinc-server-6.11.0+r18946.orig/db/constraints.sql
-+++ boinc-server-6.11.0+r18946/db/constraints.sql
-@@ -66,9 +66,15 @@
-     add index res_hostid_id (hostid, id desc),
-         -- html_user/results.php
- 
--    add index res_wu_user (workunitid, userid);
-+    add index res_wu_user (workunitid, userid),
-         -- scheduler (avoid sending mult results of same WU to one user)
- 
-+    add index ind_received_time (received_time),
-+        -- for statistics: performance
-+
-+    add index ind_hostid (hostid);
-+        -- for statistics: performance
-+
- alter table msg_from_host
-     add index message_handled (handled);
-         -- for message handler
 --- boinc-server-6.11.0+r18946.orig/sched/Makefile.am
 +++ boinc-server-6.11.0+r18946/sched/Makefile.am
 @@ -4,7 +4,8 @@
diff --git a/debian/patches/series b/debian/patches/series
index 2277c19..26e4b11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream_sztaki_improveSchedStart.patch
 local_sztaki_toolsUpgradeSimplification.patch
 upstream_sztaki_voteMonChecksConfig.patch
 upstream_sztaki_useParseConfigConsistently.patch
diff --git a/debian/patches/upstream_sztaki_improveSchedStart.patch b/debian/patches/upstream_sztaki_improveSchedStart.patch
new file mode 100644
index 0000000..38f6c21
--- /dev/null
+++ b/debian/patches/upstream_sztaki_improveSchedStart.patch
@@ -0,0 +1,55 @@
+Index: boinc/sched/start
+===================================================================
+--- boinc.orig/sched/start	2011-06-13 14:21:41.000000000 +0200
++++ boinc/sched/start	2011-06-13 14:21:46.000000000 +0200
+@@ -232,10 +232,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())
+@@ -334,12 +343,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):
+@@ -456,7 +471,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