From: Jason Stephenson <jason@sigio.com>
Date: Tue, 9 Jul 2019 19:39:32 +0000 (-0400)
Subject: Undo changes to ls_ftp in RemoteAccount.pm
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ef077c1a76336ff27d8822aeae272f7a7dcdb573;p=working%2FEvergreen.git

Undo changes to ls_ftp in RemoteAccount.pm

Rather than sort out the underlying bug, we remove all of the plaster
so that we're back to where we had a silent "failure."

Signed-off-by: Jason Stephenson <jason@sigio.com>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/RemoteAccount.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/RemoteAccount.pm
index b40f0dd42e..16feb475a1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/RemoteAccount.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/RemoteAccount.pm
@@ -646,11 +646,10 @@ sub ls_ftp {   # returns full path like: dir/path/file.ext
         my $dirtarget = $dirpath || $_;
         $dirtarget =~ s/\/+$//;
         eval { @part = $self->_ftp->ls($dirtarget) };      # this ls returns relative/path/filenames.  defer filename glob filtering for below.
-        if ($@ or !@part) {
+        if ($@) {
             $logger->error(
                 $self->_error(
-                    "ls from",  $self->remote_host, "failed with error: " . (defined($self->_ftp))
-                        ? $self->_ftp->message : $@
+                    "ls from",  $self->remote_host, "failed with error: $@"
                 )
             );
             next;