Don't trust X-Object-Meta-Mtime

Still use it if we can, but stop throwing ValueErrors if it's garbage.

Change-Id: I2cf25b535ad62cfacb7561954a92a4a73d91000a

1 files changed, 8 insertions, 4 deletions

diff --git a/swiftclient/service.py b/swiftclient/service.py
index 492055d..20c023b 100644
--- a/swiftclient/service.py
+++ b/swiftclient/service.py
@@ -1162,11 +1162,15 @@ class SwiftService(object):
                 if fp is not None:
                     fp.close()
                     if 'x-object-meta-mtime' in headers and not no_file:
-                        mtime = float(headers['x-object-meta-mtime'])
-                        if options['out_file']:
-                            utime(options['out_file'], (mtime, mtime))
+                        try:
+                            mtime = float(headers['x-object-meta-mtime'])
+                        except ValueError:
+                            pass  # no real harm; couldn't trust it anyway
                         else:
-                            utime(path, (mtime, mtime))
+                            if options['out_file']:
+                                utime(options['out_file'], (mtime, mtime))
+                            else:
+                                utime(path, (mtime, mtime))
 
             res = {
                 'action': 'download_object',