From: Wayne Davison <wayne@opencoder.net>
Date: Mon, 15 Jun 2020 18:52:54 +0000 (-0700)
Subject: Fixed setting of rsync_lastver var.
X-Git-Tag: v3.2.0pre2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2452ad3663938546f173efb2e09a4f2cbfd91cad;p=thirdparty%2Frsync.git

Fixed setting of rsync_lastver var.
---

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 ''