From: Wayne Davison <wayne@opencoder.net>
Date: Sat, 10 Sep 2022 23:19:21 +0000 (-0700)
Subject: A few more tweaks.
X-Git-Tag: v3.2.7pre1~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1750288660ab92ce6ea8c6aead4ca4a3a5107bde;p=thirdparty%2Frsync.git

A few more tweaks.
---

diff --git a/NEWS.md b/NEWS.md
index 81d66b63..fe962ad0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -13,7 +13,7 @@
   digests are at the highest priority in the new negotiation list.
 
 - Added support for SHA1, SHA256, and SHA512 digests in file checksums.  While
-  This tends to be overkill, if someone needs it, it is available.  These
+  this tends to be overkill, it is available if someone really needs it.  These
   overly-long checksums are at the lowest priority in the normal checksum
   negotation list.
 
@@ -21,9 +21,11 @@
   output in a (still human-readable) JSON format (client side only).
 
 - The script `support/json-rsync-version` is available to get the JSON style
-  version output from any rsync.  The script accepts the version output on
-  stdin **or** the name of an rsync to run as an arg.  If the text isn't
-  already in JSON format, the text is translated into equivalent JSON.
+  version output from any rsync.  The script accepts either text on stdin
+  **or** an arg that specifies an rsync executable to run with a doubled
+  `--version` option.  If the text we get isn't already in JSON format, it is
+  converted into equivalent JSON as rsync 3.2.7 would output it (though some
+  info may be missing from older versions).
 
 ### PACKAGING RELATED:
 
diff --git a/support/json-rsync-version b/support/json-rsync-version
index 81a8c8de..6f083bae 100755
--- a/support/json-rsync-version
+++ b/support/json-rsync-version
@@ -49,6 +49,9 @@ def main():
             sect_name = line.strip(' :').replace(' ', '_').lower()
             info[sect_name] = [ ]
             saw_comma = False
+    for chk in 'capabilities optimizations'.split():
+        if chk not in info:
+            info[chk] = { }
     for chk in 'checksum_list compress_list daemon_auth_list'.split():
         if chk not in info:
             info[chk] = [ ]