git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo and a traceback
[util-vserver.git]
/
python
/
vserver.py
diff --git
a/python/vserver.py
b/python/vserver.py
index
32f27ad
..
30e619b
100644
(file)
--- a/
python/vserver.py
+++ b/
python/vserver.py
@@
-1,6
+1,6
@@
# Copyright 2005 Princeton University
# Copyright 2005 Princeton University
-#$Id: vserver.py,v 1.6
6 2007/07/31 16:31:04
dhozac Exp $
+#$Id: vserver.py,v 1.6
9 2007/08/01 18:33:28
dhozac Exp $
import errno
import fcntl
import errno
import fcntl
@@
-61,6
+61,9
@@
class VServerConfig:
def __init__(self, name, directory):
self.name = name
self.dir = directory
def __init__(self, name, directory):
self.name = name
self.dir = directory
+ if not (os.path.isdir(self.dir) and
+ os.access(self.dir, os.R_OK | os.W_OK | os.X_OK)):
+ raise NoSuchVServer, "%s does not exist" % self.dir
def get(self, option, default = None):
try:
def get(self, option, default = None):
try:
@@
-424,14
+427,14
@@
class VServer:
# execute each init script in turn
# XXX - we don't support all scripts that vserver script does
self.__do_chcontext(state_file)
# execute each init script in turn
# XXX - we don't support all scripts that vserver script does
self.__do_chcontext(state_file)
- for cmd in self.INITSCRIPTS
+ [None]
:
+ for cmd in self.INITSCRIPTS:
try:
# enter vserver context
arg_subst = { 'runlevel': runlevel }
cmd_args = [cmd[0]] + map(lambda x: x % arg_subst,
cmd[1:])
print >>log, "executing '%s'" % " ".join(cmd_args)
try:
# enter vserver context
arg_subst = { 'runlevel': runlevel }
cmd_args = [cmd[0]] + map(lambda x: x % arg_subst,
cmd[1:])
print >>log, "executing '%s'" % " ".join(cmd_args)
- os.spawnvp(os.P_WAIT,cmd[0],
*
cmd_args)
+ os.spawnvp(os.P_WAIT,cmd[0],cmd_args)
except:
traceback.print_exc()
os._exit(1)
except:
traceback.print_exc()
os._exit(1)