summaryrefslogtreecommitdiff
path: root/openstackclient/common/utils.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-02 17:16:04 +0000
committerGerrit Code Review <review@openstack.org>2015-03-02 17:16:04 +0000
commit9ce112f1a1e05d18e590da20c268de967a7b4795 (patch)
tree34cba2cb088d1a86657036bbac7b6a8b3a8d69bf /openstackclient/common/utils.py
parentb972937c826f4dfdab0fb7f3a6b1f90e3d90f575 (diff)
parentd13023b32a990241a4a0ebb7fb2dab5391c003e3 (diff)
downloadpython-openstackclient-9ce112f1a1e05d18e590da20c268de967a7b4795.tar.gz
Merge "Fix error msg in sort_items"
Diffstat (limited to 'openstackclient/common/utils.py')
-rw-r--r--openstackclient/common/utils.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py
index c800b4cf..4139770c 100644
--- a/openstackclient/common/utils.py
+++ b/openstackclient/common/utils.py
@@ -200,8 +200,14 @@ def sort_items(items, sort_str):
reverse = False
if ':' in sort_key:
sort_key, direction = sort_key.split(':', 1)
+ if not sort_key:
+ msg = "empty string is not a valid sort key"
+ raise exceptions.CommandError(msg)
if direction not in ['asc', 'desc']:
- msg = "Specify sort direction by asc or desc"
+ if not direction:
+ direction = "empty string"
+ msg = ("%s is not a valid sort direction for sort key %s, "
+ "use asc or desc instead" % (direction, sort_key))
raise exceptions.CommandError(msg)
if direction == 'desc':
reverse = True