From: Ansgar Burchardt Date: Sun, 3 Feb 2013 12:42:51 +0000 (+0100) Subject: debianqueued: open ftp connection when trying to upload .dak-commands X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=077bf03c4495465e28388f52e471877b7afa821a;p=dak debianqueued: open ftp connection when trying to upload .dak-commands --- diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued index 52af83e8..39d7ba5f 100755 --- a/tools/debianqueued-0.9/debianqueued +++ b/tools/debianqueued-0.9/debianqueued @@ -920,9 +920,7 @@ outer_loop: while () { 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) {