git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag util-vserver-pl-0.4-29
[util-vserver-pl.git]
/
python
/
vserver.py
diff --git
a/python/vserver.py
b/python/vserver.py
index
dea58c6
..
b2ad6a8
100644
(file)
--- a/
python/vserver.py
+++ b/
python/vserver.py
@@
-16,7
+16,8
@@
import commands
import resource
import vserverimpl
import resource
import vserverimpl
-import cpulimit, bwlimit
+import cpulimit
+import plnode.bwlimit as bwlimit
from vserverimpl import DLIMIT_INF
from vserverimpl import VC_LIM_KEEP
from vserverimpl import DLIMIT_INF
from vserverimpl import VC_LIM_KEEP
@@
-193,7
+194,7
@@
class VServer:
def get_prefix_from_capabilities(self, capabilities, prefix):
split_caps = capabilities.split(',')
def get_prefix_from_capabilities(self, capabilities, prefix):
split_caps = capabilities.split(',')
- return ",".join(["%s" % (c) for c in split_caps if c.startswith(prefix.upper()) or c.startswith(prefix.lower())])
+ return ",".join(["%s" % (c
[len(prefix):]
) for c in split_caps if c.startswith(prefix.upper()) or c.startswith(prefix.lower())])
def get_bcaps_from_capabilities(self, capabilities):
return self.get_prefix_from_capabilities(capabilities, "cap_")
def get_bcaps_from_capabilities(self, capabilities):
return self.get_prefix_from_capabilities(capabilities, "cap_")