From c7bb554b8d855b318f2699788c99c9e0402d893e Mon Sep 17 00:00:00 2001 From: Steve Muir Date: Fri, 13 Jan 2006 19:32:50 +0000 Subject: [PATCH] Merge bugfix into release branch --- python/vserverimpl.c | 4 +++- util-vserver.spec | 7 ++++++- util-vserver.spec.in | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/python/vserverimpl.c b/python/vserverimpl.c index 00c8980..6b1284c 100644 --- a/python/vserverimpl.c +++ b/python/vserverimpl.c @@ -151,7 +151,9 @@ vserver_setsched(PyObject *self, PyObject *args) get_rspec(resources, &rspec)) return NULL; - if (pl_setsched(ctx, rspec.cpu_share, rspec.cpu_sched_flags)) + /* ESRCH indicates that there are no processes in the context */ + if (pl_setsched(ctx, rspec.cpu_share, rspec.cpu_sched_flags) && + errno != ESRCH) return PyErr_SetFromErrno(PyExc_OSError); return Py_None; diff --git a/util-vserver.spec b/util-vserver.spec index 2917a1e..2699259 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -17,7 +17,7 @@ %define name util-vserver %define version 0.30.208 -%define release 7.planetlab%{?date:.%{date}} +%define release 8%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define _without_dietlibc 1 %define _without_xalan 1 @@ -384,6 +384,11 @@ done %changelog +* Fri Jan 13 2006 Steve Muir +- fix bug in python/vserverimpl.c where attempting to adjust CPU share + for a context that didn't exist would cause an error (it should be a + safe no-op) + * Fri Dec 2 2005 Steve Muir - fix bugs in python/vserverimpl.c where exceptions were not raised when they should be and thus occured later at unexpected times diff --git a/util-vserver.spec.in b/util-vserver.spec.in index d69e465..ce9c031 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -17,7 +17,7 @@ %define name @PACKAGE@ %define version @VERSION@ -%define release 7.planetlab%{?date:.%{date}} +%define release 8%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define _without_dietlibc 1 %define _without_xalan 1 -- 2.43.0