The branch, master has been updated
via 6a9adabf Mention the early-input on stdin.
via 2564f251 Put the date in the heading of a pre release too.
from 7fb08531 Preparing for release of 3.2.1pre1
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6a9adabfbbebf682c173c1ee1c9322a94cf096be
Author: Wayne Davison <wa...@opencoder.net>
Date: Sun Jun 21 20:25:28 2020 -0700
Mention the early-input on stdin.
commit 2564f25114955ed3ceaea7941b5d3173b7613ced
Author: Wayne Davison <wa...@opencoder.net>
Date: Sun Jun 21 19:46:28 2020 -0700
Put the date in the heading of a pre release too.
-----------------------------------------------------------------------
Summary of changes:
packaging/pkglib.py | 4 ++--
packaging/release-rsync | 3 +--
rsyncd.conf.5.md | 4 +++-
3 files changed, 6 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/pkglib.py b/packaging/pkglib.py
index 8badb46d..628669b0 100644
--- a/packaging/pkglib.py
+++ b/packaging/pkglib.py
@@ -218,8 +218,8 @@ def get_NEWS_version_info():
with open('NEWS.md', 'r', encoding='utf-8') as fh:
for line in fh:
- if not last_version:
- m = re.search(r'rsync (\d+\.\d+\.\d+).*\d\d\d\d', line)
+ if not last_version: # Find the first non-dev|pre version with a
release date.
+ m = re.search(r'rsync (\d+\.\d+\.\d+) .*\d\d\d\d', line)
if m:
last_version = m[1]
m = rel_re.match(line)
diff --git a/packaging/release-rsync b/packaging/release-rsync
index 99d02b69..7758a30e 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -190,8 +190,7 @@ About to:
elif fn == 'NEWS.md':
efv = re.escape(finalversion)
x_re = re.compile(r'^---+\n<.+>\s+# NEWS .+\s+Protocol: .+\n')
- rel_day = 'UNRELEASED' if pre else today
- repl = ('-'*78 + f'\n<a name="{version}"></a>\n\n# NEWS for rsync
{version} ({rel_day})\n\n'
+ repl = ('-'*78 + f'\n<a name="{version}"></a>\n\n# NEWS for rsync
{version} ({today})\n\n'
+ f"Protocol: {protocol_version} ({proto_changed})\n")
msg = f"The top lines of {fn} are not in the right format. They
must be:\n" + repl
txt = replace_or_die(x_re, repl, txt, msg)
diff --git a/rsyncd.conf.5.md b/rsyncd.conf.5.md
index 84d2670a..bc5a571b 100644
--- a/rsyncd.conf.5.md
+++ b/rsyncd.conf.5.md
@@ -957,7 +957,9 @@ the values of parameters. See the GLOBAL PARAMETERS
section for more details.
request is known except for the module name. This helper script can be
used to setup a disk mount or decrypt some data into a module dir, but you
may need to use `lock file` and `max connections` to avoid concurrency
- issues.
+ issues. If the client rsync specified the `--early-input=FILE` option, it
+ can send up to about 5K of data to the stdin of the early script. The
+ stdin will otherwise be empty.
Note that the `post-xfer exec` command is still run even if one of the
other scripts returns an error code. The `pre-xfer exec` command will _not_
--
The rsync repository.
_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
