openstack/swift
Code Issues Proposed changes

Merge "Fix a couple ifs in account quota middleware."

Browse Source
This commit is contained in:
Jenkins 2014-02-06 14:08:14 +00:00 committed by Gerrit Code Review
commit 90337ba440
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/common/middleware/account_quotas.py
View File

@ -103,7 +103,7 @@ class AccountQuotaMiddleware(object):
if new_quota is not None: if new_quota is not None:
return HTTPForbidden() return HTTPForbidden()
if obj and request.method == "POST" or not obj: if request.method == "POST" or not obj:
return self.app return self.app
if request.method == 'COPY': if request.method == 'COPY':
@ -123,7 +123,7 @@ class AccountQuotaMiddleware(object):
if quota < 0: if quota < 0:
return self.app return self.app
if obj and copy_from: if copy_from:
path = '/' + ver + '/' + account + '/' + copy_from.lstrip('/') path = '/' + ver + '/' + account + '/' + copy_from.lstrip('/')
object_info = get_object_info(request.environ, self.app, path) object_info = get_object_info(request.environ, self.app, path)
if not object_info or not object_info['length']: if not object_info or not object_info['length']: