diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-22 17:00:50 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-22 17:00:50 -0400 |
| commit | c0c45eba28e623751d71a7fa3cb27c87300b851e (patch) | |
| tree | 67fbb66105b1b81fa92240c59543962d716087e3 /cloudinit/cmd/main.py | |
| parent | c13f800d19884a28c57745f692d1b5221c6c3a6c (diff) | |
| parent | 40a2f621b05c11ed6397a1735b6bfff0ea07b097 (diff) | |
| download | vyos-cloud-init-c0c45eba28e623751d71a7fa3cb27c87300b851e.tar.gz vyos-cloud-init-c0c45eba28e623751d71a7fa3cb27c87300b851e.zip | |
merge from master at 0.7.7-17-g40a2f62
Diffstat (limited to 'cloudinit/cmd/main.py')
| -rw-r--r-- | cloudinit/cmd/main.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py index ba22b168..83eb02c9 100644 --- a/cloudinit/cmd/main.py +++ b/cloudinit/cmd/main.py @@ -46,7 +46,7 @@ from cloudinit.reporting import events from cloudinit.settings import (PER_INSTANCE, PER_ALWAYS, PER_ONCE, CLOUD_CONFIG) -from cloudinit.atomic_helper import atomic_write_json +from cloudinit import atomic_helper from cloudinit.dhclient_hook import LogDhclient @@ -513,7 +513,7 @@ def status_wrapper(name, args, data_d=None, link_d=None): v1['stage'] = mode v1[mode]['start'] = time.time() - atomic_write_json(status_path, status) + atomic_helper.write_json(status_path, status) util.sym_link(os.path.relpath(status_path, link_d), status_link, force=True) @@ -536,7 +536,7 @@ def status_wrapper(name, args, data_d=None, link_d=None): v1[mode]['finished'] = time.time() v1['stage'] = None - atomic_write_json(status_path, status) + atomic_helper.write_json(status_path, status) if mode == "modules-final": # write the 'finished' file @@ -545,9 +545,9 @@ def status_wrapper(name, args, data_d=None, link_d=None): if v1[m]['errors']: errors.extend(v1[m].get('errors', [])) - atomic_write_json(result_path, - {'v1': {'datasource': v1['datasource'], - 'errors': errors}}) + atomic_helper.write_json( + result_path, {'v1': {'datasource': v1['datasource'], + 'errors': errors}}) util.sym_link(os.path.relpath(result_path, link_d), result_link, force=True) |