r905 - in /branches/boinc/experimental/debian: boinc-client.init changelog

[fst at users.alioth.debian.org]

Author: fst
Date: Thu May 22 11:11:49 2008
New Revision: 905

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=905
Log:
Merged from the trunk branch (to bring the two branches in sync):
svn merge -r 895:897 svn+ssh://svn.debian.org/svn/pkg-boinc/trunk/boinc .

Modified:
    branches/boinc/experimental/debian/boinc-client.init
    branches/boinc/experimental/debian/changelog

Modified: branches/boinc/experimental/debian/boinc-client.init
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/boinc-client.init?rev=905&op=diff
==============================================================================
--- branches/boinc/experimental/debian/boinc-client.init (original)
+++ branches/boinc/experimental/debian/boinc-client.init Thu May 22 11:11:49 2008
@@ -114,8 +114,11 @@
     if [ ! -x "`which ionice 2>/dev/null`" ]; then
       log_progress_msg "ionice not found,"
     else
-      ionice -c 3 -p $pid
-      log_progress_msg "idle,"
+      if ionice -c 3 -p $pid 2>/dev/null; then
+        log_progress_msg "idle,"
+      else
+        log_progress_msg "ionice failed,"
+      fi
     fi
 
     if [ ! -x "`which schedtool 2>/dev/null`" ]; then

Modified: branches/boinc/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/boinc/experimental/debian/changelog?rev=905&op=diff
==============================================================================
--- branches/boinc/experimental/debian/changelog (original)
+++ branches/boinc/experimental/debian/changelog Thu May 22 11:11:49 2008
@@ -17,6 +17,14 @@
     just remove all that can be found.
 
  -- Frank S. Thomas <fst at debian.org>  Tue, 15 Apr 2008 15:09:05 +0200
+
+boinc (5.10.45-3) unstable; urgency=low
+
+  [ Daniel Hahler ]
+  * debian/boinc-client.init:
+    Do not fail, if ionice/ioprio_set is not allowed (LP: #218468)
+
+ -- Frank S. Thomas <fst at debian.org>  Wed, 14 May 2008 12:12:06 +0200
 
 boinc (6.1.15-1) experimental; urgency=low