The branch, master has been updated via 2c120403 Make sure that the configure.sh script is up-to-date in a release. via 8adc2240 Mention `copy-devices`. via 84ad8352 Remove unneeded var. from 9a3449a3 Stop enabling -pedantic-errors.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2c1204032b15bd0c4c7ce54b65090867492557e2 Author: Wayne Davison <wa...@opencoder.net> Date: Fri Aug 19 08:57:47 2022 -0700 Make sure that the configure.sh script is up-to-date in a release. commit 8adc2240e0badaf8b66ea1d77314fe1bf162209a Author: Wayne Davison <wa...@opencoder.net> Date: Fri Aug 19 08:56:42 2022 -0700 Mention `copy-devices`. commit 84ad83525b3336eeca76c34f078869e17feddabd Author: Wayne Davison <wa...@opencoder.net> Date: Fri Aug 19 08:55:51 2022 -0700 Remove unneeded var. ----------------------------------------------------------------------- Summary of changes: packaging/pkglib.py | 2 +- packaging/release-rsync | 8 ++++---- support/rrsync | 1 + t_stub.c | 1 - util1.c | 1 - 5 files changed, 6 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/pkglib.py b/packaging/pkglib.py index 52f3d892..6f5557aa 100644 --- a/packaging/pkglib.py +++ b/packaging/pkglib.py @@ -32,7 +32,7 @@ def _tweak_opts(cmd, opts, **maybe_set_args): opts = opts.copy() _maybe_set(opts, **maybe_set_args) - if type(cmd) == str: + if isinstance(cmd, str): _maybe_set(opts, shell=True) want_raw = opts.pop('raw', False) diff --git a/packaging/release-rsync b/packaging/release-rsync index 5e54d06e..f37bd184 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -232,7 +232,7 @@ About to: cmd_chk(['packaging/year-tweak']) print(dash_line) - cmd_run("git diff") + cmd_run("git diff".split()) srctar_name = f"{rsync_ver}.tar.gz" pattar_name = f"rsync-patches-{version}.tar.gz" @@ -247,7 +247,7 @@ About to: About to: - git commit all changes - - generate the manpages + - run a full build, ensuring that the manpages & configure.sh are up-to-date - merge the {args.master_branch} branch into the patch/{args.master_branch}/* branches - update the files in the "patches" dir and OPTIONALLY (if you type 'y') to run patch-update with the --make option (which opens a shell on error) @@ -258,9 +258,9 @@ About to: if s.returncode: die('Aborting') - cmd_chk('make gen') + cmd_chk('touch configure.ac && packaging/smart-make && make gen') - print(f'Creating any missing patch branches.') + print('Creating any missing patch branches.') s = cmd_run(f'packaging/branch-from-patch --branch={args.master_branch} --add-missing') if s.returncode: die('Aborting') diff --git a/support/rrsync b/support/rrsync index 629aa182..94c85f59 100755 --- a/support/rrsync +++ b/support/rrsync @@ -47,6 +47,7 @@ long_opts = { 'compress-choice': 1, 'compress-level': 1, 'copy-dest': 2, + 'copy-devices': -1, 'copy-unsafe-links': 0, 'daemon': -1, 'debug': 1, diff --git a/t_stub.c b/t_stub.c index a9ce5848..085378a8 100644 --- a/t_stub.c +++ b/t_stub.c @@ -29,7 +29,6 @@ int protect_args = 0; int module_id = -1; int relative_paths = 0; int module_dirlen = 0; -int preserve_mtimes = 0; int preserve_xattrs = 0; int preserve_perms = 0; int preserve_executability = 0; diff --git a/util1.c b/util1.c index 5f14723e..671f3c75 100644 --- a/util1.c +++ b/util1.c @@ -31,7 +31,6 @@ extern int do_fsync; extern int protect_args; extern int modify_window; extern int relative_paths; -extern int preserve_mtimes; extern int preserve_xattrs; extern int omit_link_times; extern int preallocate_files; -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs