diff options
| author | Sergey Gotliv <sgotliv@redhat.com> | 2016-04-03 07:37:33 +0300 |
|---|---|---|
| committer | Pete Zaitcev <zaitcev@kotori.zaitcev.us> | 2016-04-08 20:55:18 -0600 |
| commit | 909bdf89542a9d021eb2ddcb951950f36245bc8b (patch) | |
| tree | 0669f22fe1804a20e4db4b4d4198df0c9a465de4 /swiftclient | |
| parent | f86b2d8138f5c366d0f8ab8e8cb2492d9cd07ca4 (diff) | |
| download | python-swiftclient-909bdf89542a9d021eb2ddcb951950f36245bc8b.tar.gz | |
Fix downloading from "marker" item
The documentation of "swift download" hints that "marker" option
is supported, but in reality we forgot to patch it through, so
all downloads were always done with the default, empty marker.
Closes-Bug: #1565393
Change-Id: I38bd29d2baa9188b61397dec75ce1d864041653c
Diffstat (limited to 'swiftclient')
| -rw-r--r-- | swiftclient/service.py | 2 | ||||
| -rwxr-xr-x | swiftclient/shell.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/swiftclient/service.py b/swiftclient/service.py index 99c833e..7d6f6be 100644 --- a/swiftclient/service.py +++ b/swiftclient/service.py @@ -883,7 +883,7 @@ class SwiftService(object): @staticmethod def _list_container_job(conn, container, options, result_queue): - marker = '' + marker = options.get('marker', '') error = None try: while True: diff --git a/swiftclient/shell.py b/swiftclient/shell.py index 2c5bca8..c1b893d 100755 --- a/swiftclient/shell.py +++ b/swiftclient/shell.py @@ -203,7 +203,7 @@ def st_delete(parser, args, output_manager): output_manager.error(err.value) -st_download_options = '''[--all] [--marker] [--prefix <prefix>] +st_download_options = '''[--all] [--marker <marker>] [--prefix <prefix>] [--output <out_file>] [--output-dir <out_directory>] [--object-threads <threads>] [--container-threads <threads>] [--no-download] @@ -225,7 +225,7 @@ Positional arguments: Optional arguments: -a, --all Indicates that you really want to download everything in the account. - -m, --marker Marker to use when starting a container or account + -m, --marker <marker> Marker to use when starting a container or account download. -p, --prefix <prefix> Only download items beginning with <prefix> -r, --remove-prefix An optional flag for --prefix <prefix>, use this |