From: Wayne Davison Date: Sat, 7 May 2022 00:24:07 +0000 (-0700) Subject: Use the maintainer's timezone for translating the manpage date. X-Git-Tag: v3.2.5pre1~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=664639e34959ccdbbb10972ec3b2a24394fbabcb;p=thirdparty%2Frsync.git Use the maintainer's timezone for translating the manpage date. --- diff --git a/md-convert b/md-convert index 41a1930a..ac3e658d 100755 --- a/md-convert +++ b/md-convert @@ -115,7 +115,8 @@ NBR_SPACE = ('\xa0', r"\ ") FILENAME_RE = re.compile(r'^(?P(?P.+/)?(?P(?P[^/]+?)(\.(?P\d+))?)\.md)$') ASSIGNMENT_RE = re.compile(r'^(\w+)=(.+)') -QUOTED_RE = re.compile(r'"(.+?)"') +VER_RE = re.compile(r'^#define\s+RSYNC_VERSION\s+"(\d.+?)"', re.M) +TZ_RE = re.compile(r'^#define\s+MAINTAINER_TZ_OFFSET\s+(-?\d+(\.\d+)?)', re.M) VAR_REF_RE = re.compile(r'\$\{(\w+)\}') VERSION_RE = re.compile(r' (\d[.\d]+)[, ]') BIN_CHARS_RE = re.compile(r'[\1-\7]+') @@ -224,8 +225,10 @@ def find_man_substitutions(): with open(srcdir + 'version.h', 'r', encoding='utf-8') as fh: txt = fh.read() - m = QUOTED_RE.search(txt) + m = VER_RE.search(txt) env_subs['VERSION'] = m.group(1) + m = TZ_RE.search(txt) # the tzdata lib may not be installed, so we use a simple hour offset + tz_offset = float(m.group(1)) * 60 * 60 with open('Makefile', 'r', encoding='utf-8') as fh: for line in fh: @@ -241,7 +244,7 @@ def find_man_substitutions(): if var == 'srcdir': break - env_subs['date'] = time.strftime('%d %b %Y', time.localtime(mtime)) + env_subs['date'] = time.strftime('%d %b %Y', time.gmtime(mtime + tz_offset)).lstrip('0') def html_via_commonmark(txt): diff --git a/version.h b/version.h index ed77460c..7bb1a5c9 100644 --- a/version.h +++ b/version.h @@ -1 +1,2 @@ #define RSYNC_VERSION "3.2.5dev" +#define MAINTAINER_TZ_OFFSET -7.0