From ef077c1a76336ff27d8822aeae272f7a7dcdb573 Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Tue, 9 Jul 2019 15:39:32 -0400 Subject: [PATCH] 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 --- Open-ILS/src/perlmods/lib/OpenILS/Utils/RemoteAccount.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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; -- 2.11.0