openstack/swift
Code Issues Proposed changes

Merge "Drop unnecessary dereferencing"

Browse Source
This commit is contained in:
Jenkins 2017-05-12 21:26:58 +00:00 committed by Gerrit Code Review
commit 6e893e2288
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/obj/diskfile.py
View File

@ -1534,7 +1534,7 @@ class BaseDiskFileWriter(object):
self._put_succeeded = True self._put_succeeded = True
if cleanup: if cleanup:
try: try:
self.manager.cleanup_ondisk_files(self._datadir)['files'] self.manager.cleanup_ondisk_files(self._datadir)
except OSError: except OSError:
logging.exception(_('Problem cleaning up %s'), self._datadir) logging.exception(_('Problem cleaning up %s'), self._datadir)
@ -2725,7 +2725,7 @@ class ECDiskFileWriter(BaseDiskFileWriter):
'No space left on device for %(file)s (%(err)s)' % params) 'No space left on device for %(file)s (%(err)s)' % params)
else: else:
try: try:
self.manager.cleanup_ondisk_files(self._datadir)['files'] self.manager.cleanup_ondisk_files(self._datadir)
except OSError as os_err: except OSError as os_err:
self.manager.logger.exception( self.manager.logger.exception(
_('Problem cleaning up %(datadir)s (%(err)s)'), _('Problem cleaning up %(datadir)s (%(err)s)'),