Merge branch 'release_15.10' into release_16.01

Conflicts: lib/galaxy/util/__init__.py
jmchilton · Feb 19, 2016 · b5e91d2 · b5e91d2
2 parents b4c823f + 6c83fbe
commit b5e91d2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py
@@ -361,7 +361,11 @@ def pretty_print_time_interval( time=False, precise=False ):
     elif isinstance( time, datetime ):
         diff = now - time
     elif isinstance( time, string_types ):
-        time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S.%f" )
+        try:
+            time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S.%f" )
+        except ValueError:
+            # MySQL may not support microseconds precision
+            time = datetime.strptime( time, "%Y-%m-%dT%H:%M:%S" )
         diff = now - time
     else:
         diff = now - now