]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
common/utime: don't pass %z to utime if there is a 'Z'
authorSage Weil <sage@redhat.com>
Fri, 24 May 2019 22:09:53 +0000 (17:09 -0500)
committerSage Weil <sage@redhat.com>
Wed, 29 May 2019 19:12:15 +0000 (14:12 -0500)
This fails on centos 7 for some reason.

If it's UTC, we don't need to parse the tz portion, so avoid the issue by
leaving the %z out of the fmt string.

Signed-off-by: Sage Weil <sage@redhat.com>
src/include/utime.h

index 6d931b8704abb0b9af071696cb5a09d71ee1751b..4a78ba4be6f62c1a88a3e22244d1823a636a3d97 100644 (file)
@@ -408,7 +408,7 @@ public:
          }
        }
        // look for tz...
-       if (*q == '-' || *q == '+' || *q == 'Z') {
+       if (*q == '-' || *q == '+') {
          *q = '%';
          *(q+1) = 'z';
          *(q+2) = 0;