Skip to content

Commit 9da9218

Browse files
committed
OTWO-3236 Fix SVN Failing Jobs (SlocJob)
* Recently when using svn 1.8.8 and encountering a new directory change the expection wasn't handled and it was returning a non-zero exit code * Earlier in 1.6.6, it was returning 0 as exit code and hence it wasn't occuring * Now, the exception message has been updated matching the regex
1 parent 3d8046d commit 9da9218

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/scm/adapters/svn/cat_file.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def cat(path, revision)
1212
begin
1313
run "svn cat --trust-server-cert --non-interactive -r #{revision} '#{SvnAdapter.uri_encode(File.join(self.root, self.branch_name.to_s, path.to_s))}@#{revision}'"
1414
rescue
15-
raise unless $!.message =~ /svn:.*Could not cat all targets because some targets don't exist/
15+
raise unless $!.message =~ /svn:.*Could not cat all targets because some targets (don't exist|are directories)/
1616
end
1717
end
1818
end

0 commit comments

Comments
 (0)