The branch, master has been updated via 6f0c5630 Preparing for release of 3.2.0pre2 via 2452ad36 Fixed setting of rsync_lastver var. from 1fa38546 Document how to setup rsyncd behind a TLS proxy.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6f0c56304fdb3131a5c2a3af90761f0cfdc07f62 Author: Wayne Davison <wa...@opencoder.net> Date: Mon Jun 15 11:53:19 2020 -0700 Preparing for release of 3.2.0pre2 commit 2452ad3663938546f173efb2e09a4f2cbfd91cad Author: Wayne Davison <wa...@opencoder.net> Date: Mon Jun 15 11:52:54 2020 -0700 Fixed setting of rsync_lastver var. ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- packaging/lsb/rsync.spec | 8 ++++---- packaging/release-rsync | 7 ++++--- 3 files changed, 9 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/configure.ac b/configure.ac index 2b3a3665..54ff2c46 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rsync],[3.2.0pre1],[http://rsync.samba.org/bugzilla.html]) +AC_INIT([rsync],[3.2.0pre2],[http://rsync.samba.org/bugzilla.html]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([byteorder.h]) diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec index 64a8d720..9176ee86 100644 --- a/packaging/lsb/rsync.spec +++ b/packaging/lsb/rsync.spec @@ -1,8 +1,8 @@ Summary: A fast, versatile, remote (and local) file-copying tool Name: rsync Version: 3.2.0 -%define fullversion %{version}pre1 -Release: 0.1.pre1 +%define fullversion %{version}pre2 +Release: 0.1.pre2 %define srcdir src-previews Group: Applications/Internet License: GPL @@ -79,8 +79,8 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/rsync-ssl/certs %changelog -* Sat Jun 13 2020 Wayne Davison <way...@samba.org> -Released 3.2.0pre1. +* Mon Jun 15 2020 Wayne Davison <way...@samba.org> +Released 3.2.0pre2. * Fri Mar 21 2008 Wayne Davison <way...@samba.org> Added installation of /etc/xinetd.d/rsync file and some commented-out diff --git a/packaging/release-rsync b/packaging/release-rsync index a4c193c6..c54862ba 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -75,12 +75,9 @@ def main(): v_ver = 'v' + version rsync_ver = 'rsync-' + version - rsync_lastver = 'rsync-' + lastversion if os.path.lexists(rsync_ver): die(f'"{rsync_ver}" must not exist in the current directory.') - if os.path.lexists(rsync_lastver): - die(f'"{rsync_lastver}" must not exist in the current directory.') out = cmd_txt_chk(['git', 'tag', '-l', v_ver]) if out != '': @@ -99,6 +96,10 @@ def main(): lastversion = ans lastversion = re.sub(r'[-.]*pre[-.]*', 'pre', lastversion) + rsync_lastver = 'rsync-' + lastversion + if os.path.lexists(rsync_lastver): + die(f'"{rsync_lastver}" must not exist in the current directory.') + m = re.search(r'(pre\d+)', version) pre = m[1] if m else '' -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs