DKIM: support oversigning. Bugs 1309, 1310

[users/jgh/exim.git] / release-process / scripts / mk_exim_release.pl

diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index bd1302f9aec9d87a0f68b0f291b5ef69561377bc..995720e2c188110fad9afd69100bd4e04660844b 100755 (executable)
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -117,7 +117,7 @@ sub make_version_script {
     }
 
     my $srcdir    = File::Spec->catdir( $context->{release_tree}, 'src', 'src' );
     }
 
     my $srcdir    = File::Spec->catdir( $context->{release_tree}, 'src', 'src' );

-    chdir $srcdir or die "chdir $srcdir: $\n";
+    chdir $srcdir or die "chdir $srcdir: $!\n";

 
     if ( -f "version.sh" ) {
         print( "WARNING: version.sh already exists - leaving it in place\n" );
 
     if ( -f "version.sh" ) {
         print( "WARNING: version.sh already exists - leaving it in place\n" );


@@ -149,9 +149,9 @@ sub build_html_documentation {
     my @cmd = (
         $genpath,   '--spec',    $spec,                '--filter',
         $filter,    '--latest',  $context->{trelease}, '--tmpl',
     my @cmd = (
         $genpath,   '--spec',    $spec,                '--filter',
         $filter,    '--latest',  $context->{trelease}, '--tmpl',

-        $templates, '--docroot', $dir,                 '--localstatic',
-        (($verbose||$debug) ? '--verbose' : '')
+        $templates, '--docroot', $dir,                 '--localstatic'

     );
     );

+    push @cmd, '--verbose' if $verbose or $debug;

 
     print "Executing ", join( ' ', @cmd ), "\n";
     system(@cmd);
 
     print "Executing ", join( ' ', @cmd ), "\n";
     system(@cmd);


@@ -297,6 +297,7 @@ sub do_cleanup {
     my $context = shift;
 
     print "Cleaning up\n" if ($verbose);
     my $context = shift;
 
     print "Cleaning up\n" if ($verbose);

+    chdir( $context->{directory} ) || die;

     rmtree( $context->{release_tree}, { verbose => $debug } );
     rmtree( $context->{docbook},      { verbose => $debug } );
     rmtree( $context->{pkgdirs},      { verbose => $debug } );
     rmtree( $context->{release_tree}, { verbose => $debug } );
     rmtree( $context->{docbook},      { verbose => $debug } );
     rmtree( $context->{pkgdirs},      { verbose => $debug } );