From 5c32aee820b1ce43d9e1ef854f616c64ffc38188 Mon Sep 17 00:00:00 2001 From: Brandon Weigel Date: Wed, 22 May 2019 14:46:02 +0000 Subject: [PATCH] Try again with Travis --- includes/tuque_wrapper.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc index 54c0b0d5..08b1a402 100644 --- a/includes/tuque_wrapper.inc +++ b/includes/tuque_wrapper.inc @@ -254,13 +254,13 @@ class IslandoraFedoraObject extends FedoraObject { } catch (Exception $e) { if ($e instanceof DatastreamExistsException && variable_get('islandora_deprecation_return_false_when_datastream_exists', TRUE)) { - $message_deprecated = format_string('Returning FALSE on ingestDatastream() is deprecated in islandora:7.x-1.10. See https://github.com/Islandora/islandora/pull/680/'); + @trigger_error('Expecting FALSE on ingestDatastream failing is deprecated in islandora:7.x-1.10. Throwing an EXCEPTION on failed + datastream ingest will be the norm in future. See https://jira.duraspace.org/browse/ISLANDORA-1995.', E_USER_DEPRECATED); $message_error = format_string('The datastream @dsid already exists on the object: @pid.', array( - '@dsid' => $datastream->id, - '@pid' => $object->id, + '@dsid' => $datastream->id, '@dsid' => $datastream->id, + '@pid' => $object->id, '@pid' => $object->id, )); trigger_error(filter_xss($message_error), E_USER_NOTICE); - trigger_error(filter_xss($message_deprecated), E_USER_DEPRECATED); return FALSE; } watchdog('islandora', 'Failed to ingest datastream @dsid on object: @pid
code: @code
message: @msg', array(