git://git.onelab.eu
/
lxc-userspace.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
95a418b
)
cosmetic
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 15 Jan 2014 09:39:18 +0000
(10:39 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 15 Jan 2014 09:39:18 +0000
(10:39 +0100)
lxcsu
patch
|
blob
|
history
diff --git
a/lxcsu
b/lxcsu
index
11f1cce
..
5cba780
100755
(executable)
--- a/
lxcsu
+++ b/
lxcsu
@@
-117,7
+117,7
@@
import os.path
def find_first_dir (candidates):
for candidate in candidates:
if os.path.isdir(candidate): return candidate
def find_first_dir (candidates):
for candidate in candidates:
if os.path.isdir(candidate): return candidate
- raise Exception,"Cannot find valid dir among
%s"%'\n'.join(candidates
)
+ raise Exception,"Cannot find valid dir among
\n" + "\n".join([" ->"+c for c in candidates]
)
def find_sysfs_scope (subsystem, slice_name):
subsystem1=subsystem
def find_sysfs_scope (subsystem, slice_name):
subsystem1=subsystem
@@
-227,7
+227,7
@@
def main ():
cmd = '/usr/bin/virsh --connect lxc:/// domid %s'%slice_name
pidnum = int(os.popen(cmd).read().rstrip())
except:
cmd = '/usr/bin/virsh --connect lxc:/// domid %s'%slice_name
pidnum = int(os.popen(cmd).read().rstrip())
except:
- print "
Error finding slice %s
"%slice_name
+ print "
Domain %s not found
"%slice_name
exit(1)
pid = '%s'%pidnum
exit(1)
pid = '%s'%pidnum
@@
-236,7
+236,7
@@
def main ():
arch = getarch('/proc/%s/exe'%pid)
if (not pid):
arch = getarch('/proc/%s/exe'%pid)
if (not pid):
- print "
Not started: %s
"%slice_name
+ print "
Domain %s not started
"%slice_name
exit(1)
if arch is None:
exit(1)
if arch is None: