Executive: fixes following merge/reorg

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index 444e96e1d59528ebf5ef234c04676b969f560353..e626b06b7f34070d715204e499d47dbfb58a272d 100644 (file)
--- 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 b80fcf66b4a5c09e294fa4ac78ce8fb885502952..be141dfb55cf3f2dbd2cc1b76cb105bf2ab92fe3 100755 (executable)
--- 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();
 });