Fix mismerge

[exim.git] / release-process / scripts / mk_exim_release

diff --git a/release-process/scripts/mk_exim_release b/release-process/scripts/mk_exim_release
index 84f88803012846b4efec7e569bd223c437c0b167..ed075b42bde4906c976af28a096862353b1bbcf5 100755 (executable)
--- a/release-process/scripts/mk_exim_release
+++ b/release-process/scripts/mk_exim_release
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright (c) The Exim Maintainers 2016-2018
+# Copyright (c) The Exim Maintainers 2016 - 2023
 
 use strict;
 use warnings;
@@ -27,7 +27,7 @@ my $version_pattern = qr/
     (?<release>
     (?<target_release>
            (?<major>\d)         # 4
-         \.(?<minor>\d\d)       #  .90
+         \.(?<minor>\d+)        #  .90 or .105
       (?:\.(?<security>\d+)     #     .0
       (?:\.(?<fixes>)\d+)?)?    #       .22
     )                           # target-release ->|
@@ -39,7 +39,7 @@ my $quick_version_pattern = qr/
    (?<release>
    (?<last_tag>
            (?<major>\d)         # 4
-         \.(?<minor>\d\d)       #  .90
+         \.(?<minor>\d+)        #  .90 or .105
       (?:\.(?<security>\d+)     #     .0
       (?:\.(?<fixes>)\d+)?)?    #       .22
    )                            # last-tag ->|
@@ -162,7 +162,9 @@ package Context {
         my $workspace = $context->{workspace};
 
         if (not defined $workspace) {
-            $workspace = $context->{workspace} = File::Temp->newdir(File::Spec->tmpdir . '/exim-packaging-XXXX');
+            $workspace = $context->{workspace} = File::Temp->newdir(
+                TEMPLATE => File::Spec->tmpdir . '/exim-packaging-XXXX',
+                CLEANUP  => $context->{cleanup});
         }
         else {
             # ensure the working directory is not in place
@@ -256,8 +258,8 @@ package Context {
 
             #my $stamp = $context->{minor} ? '_'.$context->{minor} : '';
             #$stamp .= $context->{rc} if $context->{rc};
-            my $release = $context->{v}{rc} ? $context->{v}{target_release}
-                                            : $context->{v}{last_tag};
+            my $release = $context->{quick} ? $context->{v}{last_tag}
+                                            : $context->{v}{target_release};
 
             my $variant =
                   $context->{v}{rc} ? $context->{v}{rc}