diff options
Diffstat (limited to 'swiftclient/service.py')
| -rw-r--r-- | swiftclient/service.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/swiftclient/service.py b/swiftclient/service.py index 9a6c7a1..d1c98d6 100644 --- a/swiftclient/service.py +++ b/swiftclient/service.py @@ -457,13 +457,6 @@ class _SwiftReader: self._check_contents() def _check_contents(self): - if self._actual_md5 and self._expected_md5: - etag = self._actual_md5.hexdigest() - if etag != self._expected_md5: - raise SwiftError('Error downloading {0}: md5sum != etag, ' - '{1} != {2}'.format( - self._path, etag, self._expected_md5)) - if (self._content_length is not None and self._actual_read != self._content_length): raise SwiftError('Error downloading {0}: read_length != ' @@ -471,6 +464,13 @@ class _SwiftReader: self._path, self._actual_read, self._content_length)) + if self._actual_md5 and self._expected_md5: + etag = self._actual_md5.hexdigest() + if etag != self._expected_md5: + raise SwiftError('Error downloading {0}: md5sum != etag, ' + '{1} != {2}'.format( + self._path, etag, self._expected_md5)) + def bytes_read(self): return self._actual_read |