Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move module cleanup to END handler so it picks up an interrupt.

  • Loading branch information...
commit d7e68fe99187e59277f57588913642245938d9ea 1 parent fa312a3
@adunstan adunstan authored
Showing with 6 additions and 5 deletions.
  1. +6 −5 run_build.pl
View
11 run_build.pl
@@ -426,6 +426,9 @@ END
# only keep the cache in cases of success
rmtree("$ccachedir") if $ccachedir;
}
+
+ process_module_hooks('cleanup');
+
if ($have_lock)
{
if ($use_vpath)
@@ -1024,9 +1027,9 @@ sub make_contrib
sub make_contrib_install
{
return
- unless step_wanted('make')
- &&step_wanted('make-contrib')
- &&step_wanted('install');
+ unless (step_wanted('make')
+ and step_wanted('make-contrib')
+ and step_wanted('install'));
print time_str(),"running make contrib install ...\n"
if $verbose;
@@ -1681,8 +1684,6 @@ sub send_result
my $stage = shift;
- process_module_hooks('cleanup',$stage);
-
my $ts = $now || time;
my $status=shift || 0;
my $log = shift || [];
Please sign in to comment.
Something went wrong with that request. Please try again.