From: Sage Weil <sage@redhat.com>
Date: Fri, 24 May 2019 22:09:53 +0000 (-0500)
Subject: common/utime: don't pass %z to utime if there is a 'Z'
X-Git-Tag: v13.2.7~280^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28326%2Fhead;p=ceph.git

common/utime: don't pass %z to utime if there is a 'Z'

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>
(cherry picked from commit 1d1c4782eea1fac0e9230ed5ac32b19517fdd616)
---

diff --git a/src/include/utime.h b/src/include/utime.h
index d1c5208ec0a5..41d0a089a563 100644
--- a/src/include/utime.h
+++ b/src/include/utime.h
@@ -407,7 +407,7 @@ public:
 	  }
 	}
 	// look for tz...
-	if (*q == '-' || *q == '+' || *q == 'Z') {
+	if (*q == '-' || *q == '+') {
 	  *q = '%';
 	  *(q+1) = 'z';
 	  *(q+2) = 0;