[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  f27a630e Don't use c++ comments.
       via  243a9d9b A few more release script fixes.
      from  c528f8d5 Preparing for release of 3.2.0pre1

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f27a630e46d04dc3aede137dc9e898d50b305eba
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sat Jun 13 20:12:15 2020 -0700

    Don't use c++ comments.

commit 243a9d9be0355b063cb982f1c9dff0e5ccc633eb
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sat Jun 13 20:11:06 2020 -0700

    A few more release script fixes.

-----------------------------------------------------------------------

Summary of changes:
 log.c                   |  8 ++++----
 packaging/release-rsync | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/log.c b/log.c
index 22b9f99d..2d8c5937 100644
--- a/log.c
+++ b/log.c
@@ -318,10 +318,10 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
 		if (quiet)
 			return;
 		break;
-	//case FLOG:
-	//case FCLIENT:
-	//case FERROR_UTF8:
-	//case FERROR_SOCKET:
+	/*case FLOG:*/
+	/*case FCLIENT:*/
+	/*case FERROR_UTF8:*/
+	/*case FERROR_SOCKET:*/
 	default:
 		fprintf(stderr, "Bad logcode in rwrite(): %d [%s]\n", (int)code, who_am_i());
 		exit_cleanup(RERR_MESSAGEIO);
diff --git a/packaging/release-rsync b/packaging/release-rsync
index 7b969b0f..ee771bd0 100755
--- a/packaging/release-rsync
+++ b/packaging/release-rsync
@@ -254,10 +254,9 @@ About to:
     if re.match(r'^y', ans, re.I):
         print(f'\nVisiting all "patch/{args.master_branch}/*" branches ...')
         cmd_run(f"packaging/patch-update --branch={args.master_branch} --skip-check --shell")
-        cmd_run("rm -f *.[o15] *.html")
-        cmd_chk('rsync -a SaVeDiR/ .'.split())
-        shutil.rmtree('SaVeDiR')
-        cmd_chk('make gen'.split())
+
+    cmd_run("rm -f *.[o15] *.html")
+    cmd_chk('rsync -a SaVeDiR/ .'.split())
 
     if os.path.isdir('patches/.git'):
         s = cmd_run(f"cd patches && git commit -a -m 'The patches for {version}.'")
@@ -320,6 +319,11 @@ About to:
     os.mkdir(f"{rsync_ver}/patches", 0o755)
     cmd_chk(f"packaging/patch-update --skip-check --branch={args.master_branch} --gen={rsync_ver}/patches".split())
 
+    cmd_run("rm -f *.[o15] *.html")
+    cmd_chk('rsync -a SaVeDiR/ .'.split())
+    shutil.rmtree('SaVeDiR')
+    cmd_chk('make gen'.split())
+
     print(f"Creating {pattar_file} ...")
     cmd_chk(['fakeroot', 'tar', 'chzf', pattar_file, rsync_ver + '/patches'])
     shutil.rmtree(rsync_ver)
@@ -331,9 +335,7 @@ About to:
     os.link(f"{dest}/NEWS.md", news_file)
     cmd_chk(f"git log --name-status | gzip -9 >{dest}/ChangeLog.gz")
 
-    for md_fn in glob.glob('*.[1-9].md'):
-        html_fn = md_fn.replace('.md', '.html')
-        cmd_chk(['rsync', '-a', html_fn, os.path.join(dest, html_fn)])
+    cmd_chk(['rsync', '-a', *glob.glob('*.[1-9].html'), os.path.join(dest, html_fn)])
 
     for fn in (srctar_file, pattar_file, diff_file):
         asc_fn = fn + '.asc'


-- 
The rsync repository.