diff options
| author | Pavel Tikhomirov <ptikhomirov@virtuozzo.com> | 2021-07-02 16:52:13 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2021-09-03 20:31:00 +0300 |
| commit | 2ebb1c7419bdf08060e56ed9114c6a8c6c287059 (patch) | |
| tree | e22c39dd82e84c4c32b00ffa157fc909136be7fd /lib | |
| parent | f57e45df56ded0624386007787eb7661c96c169f (diff) | |
crit: fix error on memfd files parsing
Else we get error:
[root@fedora criu]# crit/crit x test/dump/zdtm/static/memfd00/56/1/ mems
...
Traceback (most recent call last):
File "/home/snorch/devel/ms/criu/crit/crit", line 6, in <module>
cli.main()
File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 430, in main
opts["func"](opts)
File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 361, in explore
explorers[opts['what']](opts)
File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 283, in explore_mems
fn = ' ' + get_file_str(opts, {
File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 214, in get_file_str
f = ft['get'](opts, ft, fd['id'])
File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 165, in ftype_reg
rf = ftype_find_in_image(opts, ft, fid, 'reg-files.img')
File "/home/snorch/devel/ms/criu/crit/pycriu/cli.py", line 154, in ftype_find_in_image
return f[ft['field']]
KeyError: 'reg'
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/py/cli.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/py/cli.py b/lib/py/cli.py index e3c4a4fb3..5419384c3 100755 --- a/lib/py/cli.py +++ b/lib/py/cli.py @@ -151,7 +151,10 @@ def ftype_find_in_files(opts, ft, fid): def ftype_find_in_image(opts, ft, fid, img): f = ftype_find_in_files(opts, ft, fid) if f: - return f[ft['field']] + if ft['field'] in f: + return f[ft['field']] + else: + return None if ft['img'] is None: ft['img'] = pycriu.images.load(dinf(opts, img))['entries'] |