import 15.2.0 Octopus source

[ceph.git] / ceph / src / pybind / mgr / volumes / fs / purge_queue.py

diff --git a/ceph/src/pybind/mgr/volumes/fs/purge_queue.py b/ceph/src/pybind/mgr/volumes/fs/purge_queue.py
index 41052ba303d658999b4ce67b85d2d050b7236eb2..6eb715fa3a616460e65a8c81f80d3706c173c838 100644 (file)
--- a/ceph/src/pybind/mgr/volumes/fs/purge_queue.py
+++ b/ceph/src/pybind/mgr/volumes/fs/purge_queue.py
@@ -23,9 +23,8 @@ def get_trash_entry_for_volume(volume_client, volname, running_jobs):
                     return 0, None
                 raise ve
     except VolumeException as ve:
-        log.error("error fetching trash entry for volume '{0}' ({1})".format(volname), ve)
+        log.error("error fetching trash entry for volume '{0}' ({1})".format(volname, ve))
         return ve.errno, None
-    return ret
 
 # helper for starting a purge operation on a trash entry
 def purge_trash_entry_for_volume(volume_client, volname, purge_dir, should_cancel):