[dak/master] debianqueued: remove optional check for binaries before queue run
We do not use it anywhere.
---
tools/debianqueued-0.9/config-backports | 3 ---
tools/debianqueued-0.9/config-security | 3 ---
tools/debianqueued-0.9/config-security-disembargo | 3 ---
tools/debianqueued-0.9/config-security-embargoed | 3 ---
tools/debianqueued-0.9/config-upload | 3 ---
tools/debianqueued-0.9/config-usper | 3 ---
tools/debianqueued-0.9/debianqueued | 13 -------------
7 files changed, 31 deletions(-)
diff --git a/tools/debianqueued-0.9/config-backports b/tools/debianqueued-0.9/config-backports
index 08f1b2d..5100bf9 100644
--- a/tools/debianqueued-0.9/config-backports
+++ b/tools/debianqueued-0.9/config-backports
@@ -16,9 +16,6 @@ $mail = "/usr/sbin/sendmail";
$gzip = "/bin/gzip";
$cp = "/bin/cp";
-# binaries which existance should be tested before each queue run
-#@test_binaries = ();
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-security b/tools/debianqueued-0.9/config-security
index 9fb2ac8..cb12812 100644
--- a/tools/debianqueued-0.9/config-security
+++ b/tools/debianqueued-0.9/config-security
@@ -16,9 +16,6 @@ $mail = "/usr/sbin/sendmail";
$gzip = "/bin/gzip";
$cp = "/bin/cp";
-# binaries which existance should be tested before each queue run
-#@test_binaries = ();
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-security-disembargo b/tools/debianqueued-0.9/config-security-disembargo
index 9690e4a..be29772 100644
--- a/tools/debianqueued-0.9/config-security-disembargo
+++ b/tools/debianqueued-0.9/config-security-disembargo
@@ -16,9 +16,6 @@ $mail = "/usr/sbin/sendmail";
$gzip = "/bin/gzip";
$cp = "/bin/cp";
-# binaries which existance should be tested before each queue run
-#@test_binaries = ();
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-security-embargoed b/tools/debianqueued-0.9/config-security-embargoed
index 8fbe6a9..eddd0cb 100644
--- a/tools/debianqueued-0.9/config-security-embargoed
+++ b/tools/debianqueued-0.9/config-security-embargoed
@@ -16,9 +16,6 @@ $mail = "/usr/sbin/sendmail";
$gzip = "/bin/gzip";
$cp = "/bin/cp";
-# binaries which existance should be tested before each queue run
-#@test_binaries = ();
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload
index 2b06bb5..8819c27 100644
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -16,9 +16,6 @@ $mail = "/usr/sbin/sendmail";
$gzip = "/bin/gzip";
$cp = "/bin/cp";
-# binaries which existance should be tested before each queue run
-#@test_binaries = ();
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/config-usper b/tools/debianqueued-0.9/config-usper
index 7a7b1cc..a0d744b 100644
--- a/tools/debianqueued-0.9/config-usper
+++ b/tools/debianqueued-0.9/config-usper
@@ -16,9 +16,6 @@ $mail = "/usr/sbin/sendmail";
$gzip = "/bin/gzip";
$cp = "/bin/cp";
-# binaries which existance should be tested before each queue run
-#@test_binaries = ();
-
# general options to ssh/scp
$ssh_options = "-o'BatchMode yes' -o'FallBackToRsh no' ".
"-o'ForwardAgent no' -o'ForwardX11 no' ".
diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index 387048b..fd6504c 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -53,7 +53,6 @@ $junk = $conf::check_md5sum;
$junk = $conf::ftpdebug;
$junk = $conf::ftptimeout;
$junk = @conf::nonus_packages;
-$junk = @conf::test_binaries;
$junk = @conf::maintainer_mail;
$junk = @conf::targetdir_delayed;
$junk = $conf::mail ||= '/usr/sbin/sendmail';
@@ -446,18 +445,6 @@ sub check_dir() {
$main::dstat = "c";
write_status_file() if $conf::statusdelay;
- # test if needed binaries are available; this is if they're on maybe
- # slow-mounted NFS filesystems
- foreach (@conf::test_binaries) {
- next if -f $_;
-
- # maybe the mount succeeds now
- sleep 5;
- next if -f $_;
- msg( "log", "binary test failed for $_; delaying queue run\n" );
- goto end_run;
- } ## end foreach (@conf::test_binaries)
-
for ( $adelay = -1 ; $adelay <= $conf::max_delayed ; $adelay++ ) {
if ( $adelay == -1 ) {
$main::current_incoming = $conf::incoming;
--
2.1.4
Reply to: