mirror of
https://github.com/checkpoint-restore/criu
synced 2025-09-02 07:15:31 +00:00
zdtm: fix 'zdtm.py list' command
The command ./zdtm.py list currently fails with if opts['rootless']: ~~~~^^^^^^^^^^^^ KeyError: 'rootless' Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
committed by
Andrei Vagin
parent
21f5be91a9
commit
a302b36940
@@ -626,14 +626,14 @@ class zdtm_test:
|
|||||||
["make", "zdtm_ct"], env=dict(os.environ, MAKEFLAGS=""))
|
["make", "zdtm_ct"], env=dict(os.environ, MAKEFLAGS=""))
|
||||||
if not os.access("zdtm/lib/libzdtmtst.a", os.F_OK):
|
if not os.access("zdtm/lib/libzdtmtst.a", os.F_OK):
|
||||||
subprocess.check_call(["make", "-C", "zdtm/"])
|
subprocess.check_call(["make", "-C", "zdtm/"])
|
||||||
if opts['rootless']:
|
if 'rootless' in opts and opts['rootless']:
|
||||||
return
|
return
|
||||||
subprocess.check_call(
|
subprocess.check_call(
|
||||||
["flock", "zdtm_mount_cgroups.lock", "./zdtm_mount_cgroups", str(uuid)])
|
["flock", "zdtm_mount_cgroups.lock", "./zdtm_mount_cgroups", str(uuid)])
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def cleanup():
|
def cleanup():
|
||||||
if opts['rootless']:
|
if 'rootless' in opts and opts['rootless']:
|
||||||
return
|
return
|
||||||
subprocess.check_call(
|
subprocess.check_call(
|
||||||
["flock", "zdtm_mount_cgroups.lock", "./zdtm_umount_cgroups", str(uuid)])
|
["flock", "zdtm_mount_cgroups.lock", "./zdtm_umount_cgroups", str(uuid)])
|
||||||
|
Reference in New Issue
Block a user