[dak/master] debianqueued: open ftp connection when trying to upload .dak-commands
---
tools/debianqueued-0.9/debianqueued | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index 52af83e..39d7ba5 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -920,9 +920,7 @@ outer_loop: while (<CHANGES>) {
return;
} ## end if ( $retries > 0 && (...
- if ( $conf::upload_method eq "ftp" ) {
- return if !ftp_open();
- }
+ return if !ftp_open();
# check if the job is already present on target
# (moved to here, to avoid bothering target as long as there are errors in
@@ -1068,6 +1066,8 @@ sub process_dak_commands {
}
msg("log,mail", "(PGP/GnuPG signature by $signator)\n");
+ return if !ftp_open();
+
# check target
my @filenames = ($commands);
if (my $ls_l = is_on_target($commands, @filenames)) {
@@ -1933,6 +1933,7 @@ sub send_status() {
# open FTP connection to target host if not already open
#
sub ftp_open() {
+ return 1 unless $conf::upload_method eq "ftp";
if ($main::FTP_chan) {
--
1.7.2.5
Reply to: