From 21fb6f6798015f9f3b9744cf660bdf01822f4b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= <jsuchome@suse.cz>
Date: Mon, 29 Sep 2014 22:13:06 +0200
Subject: [PATCH] Do not crash with "swift list --lh" for Ceph RadosGW.
If 'x-timestamp' header is not present in 'swift list' result,
date string cannot be correctly generated. Check for correct
exception to catch this case and return a special string value.
This is just a workaround for faulty RadosGW behavior.
Change-Id: I172843a2668e33efac00924906ff0dca3e790050
Closes-Bug: 1349528
---
swiftclient/shell.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/swiftclient/shell.py b/swiftclient/shell.py
index d0ef8fa3..781b84aa 100755
--- a/swiftclient/shell.py
+++ b/swiftclient/shell.py
@@ -421,7 +421,7 @@ def st_list(parser, args, output_manager):
float(meta.get('x-timestamp')))
datestamp = strftime(
'%Y-%m-%d %H:%M:%S', utc)
- except ClientException:
+ except TypeError:
datestamp = '????-??-?? ??:??:??'
if not options.totals:
output_manager.print_msg(