openstack/deb-python-swiftclient
Code Issues Proposed changes

Merge " Fix swiftclient 400 error when OS_AUTH_URL is set."

Browse Source
This commit is contained in:
Jenkins
2012-10-02 06:28:09 +00:00
committed by Gerrit Code Review
parent 57dfd21e1b 8e2e97fd75
commit a99a37f7f6
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/swift
View File

@@ -1007,8 +1007,7 @@ def parse_args(parser, args, enforce_requires=True):
args = ['-h'] args = ['-h']
(options, args) = parser.parse_args(args) (options, args) = parser.parse_args(args)
if (not (options.auth and options.user and options.key) or if (not (options.auth and options.user and options.key)):
options.os_auth_url):
# Use 2.0 auth if none of the old args are present # Use 2.0 auth if none of the old args are present
options.auth_version = '2.0' options.auth_version = '2.0'