diff options
author | Samuel Merritt <sam@swiftstack.com> | 2013-10-08 14:16:32 -0700 |
---|---|---|
committer | Samuel Merritt <sam@swiftstack.com> | 2013-10-10 11:57:47 -0700 |
commit | 7d61c543993638caf5dbe176ed6c077ee506d87e (patch) | |
tree | 6f48538322cf42634e060c07b252480d3647e6d2 /bin/swift | |
parent | 68dde8dd514e4eef89aafa6c1c93e065045c3cbd (diff) | |
download | python-swiftclient-7d61c543993638caf5dbe176ed6c077ee506d87e.tar.gz |
Make pbr only a build-time dependency.
This lets you build python-swiftclient packages that don't require pbr
to be installed at all. You would need pbr on the machine running
rpmbuild / debuild, but not on the machines that install the packages.
Unfortunately, this does not make python-swiftclient able to be
installed via pip 0.3.1 on Lucid; you'll need to uninstall the system
python-pip package and install a new pip some other way. Given that
pip < 1.3 doesn't perform SSL certificate validation for pypi (trivial
MITM attack, anyone?), you'd probably want to get a new pip anyway.
Change-Id: I85d4d77aacf094e48d39e48e750594b95dbc7af0
Diffstat (limited to 'bin/swift')
-rwxr-xr-x | bin/swift | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -36,7 +36,7 @@ from swiftclient import Connection, HTTPException from swiftclient.utils import config_true_value from swiftclient.multithreading import MultiThreadingManager from swiftclient.exceptions import ClientException -from swiftclient.version import version_info +from swiftclient import __version__ as client_version def get_conn(options): @@ -1262,7 +1262,7 @@ adding "-V 2" is necessary for this.'''.strip('\n')) if __name__ == '__main__': - version = version_info.version_string() + version = client_version parser = OptionParser(version='%%prog %s' % version, usage=''' usage: %%prog [--version] [--help] [--snet] [--verbose] |