summaryrefslogtreecommitdiffstats
path: root/ufo
diff options
context:
space:
mode:
Diffstat (limited to 'ufo')
-rw-r--r--ufo/gluster-swift-ufo.spec2
-rw-r--r--ufo/gluster/swift/common/DiskFile.py10
2 files changed, 8 insertions, 4 deletions
diff --git a/ufo/gluster-swift-ufo.spec b/ufo/gluster-swift-ufo.spec
index 8d2c93b8be3..8c0167cb73f 100644
--- a/ufo/gluster-swift-ufo.spec
+++ b/ufo/gluster-swift-ufo.spec
@@ -16,7 +16,7 @@
%define _confdir %{_sysconfdir}/swift
%define _ufo_version 1.1
-%define _ufo_release 3
+%define _ufo_release 4
Summary : GlusterFS Unified File and Object Storage.
Name : gluster-swift-ufo
diff --git a/ufo/gluster/swift/common/DiskFile.py b/ufo/gluster/swift/common/DiskFile.py
index 8522295483d..62f98103762 100644
--- a/ufo/gluster/swift/common/DiskFile.py
+++ b/ufo/gluster/swift/common/DiskFile.py
@@ -137,9 +137,13 @@ class Gluster_DiskFile(DiskFile):
if os.path.isdir(data_file):
self._is_dir = True
else:
- self.fp = do_open(data_file, 'rb')
- if not keep_data_fp:
- self.close(verify_file=False)
+ if keep_data_fp:
+ # The caller has an assumption that the "fp" field of this
+ # object is an file object if keep_data_fp is set. However,
+ # this implementation of the DiskFile object does not need to
+ # open the file for internal operations. So if the caller
+ # requests it, we'll just open the file for them.
+ self.fp = do_open(data_file, 'rb')
def close(self, verify_file=True):
"""