From c1a8ce9a58859c400e5243ee38f4bc84b14e4496 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 14 Feb 2013 11:59:12 +0000
Subject: [PATCH] Executive: fixes following merge/reorg

---
 Osstest/JobDB/Executive.pm | 4 ++--
 cs-flight-bless            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index 444e96e1..e626b06b 100644
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -54,8 +54,8 @@ sub open ($) { #method
     return opendb('osstestdb');
 }
 
-sub dbfl_check ($$) {
-    my ($fl,$flok) = @_;
+sub dbfl_check ($$) { #method
+    my ($jd, $fl,$flok) = @_;
     # must be inside db_retry qw(flights)
 
     if (!ref $flok) {
diff --git a/cs-flight-bless b/cs-flight-bless
index b80fcf66..be141dfb 100755
--- a/cs-flight-bless
+++ b/cs-flight-bless
@@ -33,7 +33,7 @@ my $q= $dbh_tests->
     prepare("UPDATE FLIGHTS SET blessing=? WHERE flight=?");
 
 db_retry($dbh_tests,[qw(flights)], sub {
-    dbfl_check($flight, [@oldblessings]);
+    $mjobdb->dbfl_check($flight, [@oldblessings]);
     $q->execute($blessing, $flight);
     $q->finish();
 });
-- 
2.39.5