openstack
/
glance
Code Issues Proposed changes

Merge "Remove microseconds before time format conversion." into stable/essex

This commit is contained in:
Jenkins 2012-08-07 23:49:57 +00:00 committed by Gerrit Code Review
parent a6e320dcd0 5fa9821cd2
commit e91ea806a9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glance/store/scrubber.py
View File

@ -160,7 +160,10 @@ class Scrubber(object):
continue
time_fmt = "%Y-%m-%dT%H:%M:%S"
delete_time = calendar.timegm(time.strptime(deleted_at,
# NOTE: Strip off microseconds which may occur after the last '.,'
# Example: 2012-07-07T19:14:34.974216
date_str = deleted_at.rsplit('.', 1)[0].rsplit(',', 1)[0]
delete_time = calendar.timegm(time.strptime(date_str,
time_fmt))
if delete_time + self.cleanup_time > now: