fix bug in debug mode, #13853

[freeside.git] / FS / FS / Cron / upload.pm

diff --git a/FS/FS/Cron/upload.pm b/FS/FS/Cron/upload.pm
index 6406c15..dceead6 100644 (file)
--- a/FS/FS/Cron/upload.pm
+++ b/FS/FS/Cron/upload.pm
@@ -75,7 +75,7 @@ sub upload {
 
       eval "&billco_upload( 'agentnum' => $agentnum, 'date' => $date );";
       warn "billco_upload failed: $@\n"
-        if ( $@ );
+        if $@;
 
     }
 
@@ -93,6 +93,7 @@ sub billco_upload {
   my $agentnum = $opt{agentnum} or die "no agentnum provided\n";
   my $url      = $conf->config( 'billco-url', $agentnum )
     or die "no url for agent $agentnum\n";
+  $url =~ s/^\s+//; $url =~ s/\s+$//;
   my $username = $conf->config( 'billco-username', $agentnum, 1 )
     or die "no username for agent $agentnum\n";
   my $password = $conf->config( 'billco-password', $agentnum, 1 )
@@ -175,12 +176,14 @@ sub billco_upload {
 
     my($hostname, $path) = ($1, $2);
 
-    my $ftp = new Net::FTP($hostname)
+    my $ftp = new Net::FTP($hostname) #, Passive=>1 )
       or die "can't connect to $hostname: $@\n";
     $ftp->login($username, $password)
       or die "can't login to $hostname: ". $ftp->message."\n";
-    $ftp->cwd($path)
-      or die "can't cd $path on $hostname: ". $ftp->message. "\n";
+    unless ( $ftp->cwd($path) ) {
+      my $msg = "can't cd $path on $hostname: ". $ftp->message. "\n";
+      ( $path eq '/' ) ? warn $msg : die $msg;
+    }
     $ftp->binary
       or die "can't set binary mode on $hostname\n";