openstack
/
cinder
Code Issues Proposed changes

Merge "Rename cinder.privsep.utils to cinder.privsep.path"

This commit is contained in:
Zuul 2018-10-17 04:47:20 +00:00 committed by Gerrit Code Review
parent 946da3b323 94641537b8
commit 35ccb75c1c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
cinder/privsep/utils.py → cinder/privsep/path.py
View File

6
cinder/volume/targets/nvmet.py
View File

@ -21,7 +21,7 @@ import six
from cinder import exception
from cinder.privsep import nvmcli
import cinder.privsep.utils
import cinder.privsep.path
from cinder import utils
from cinder.volume.targets import nvmeof
@ -192,7 +192,7 @@ class NVMET(nvmeof.NVMeOF):
# in order to avoid executing cat as root
with utils.temporary_chown(tmp_file_path):
try:
out = cinder.privsep.utils.readfile(tmp_file_path)
out = cinder.privsep.path.readfile(tmp_file_path)
except putils.ProcessExecutionError:
with excutils.save_and_reraise_exception():
LOG.exception('Failed to read: %s', tmp_file_path)
@ -208,6 +208,6 @@ class NVMET(nvmeof.NVMeOF):
def _delete_file(self, file_path):
try:
cinder.privsep.utils.removefile(file_path)
cinder.privsep.path.removefile(file_path)
except putils.ProcessExecutionError:
LOG.exception('Failed to delete file: %s', file_path)