From acac16d4104ea141416e0a16b7408608103eafab Mon Sep 17 00:00:00 2001
From: Brandon Weigel <brandonw@bceln.ca>
Date: Wed, 22 May 2019 13:35:36 +0000
Subject: [PATCH] one more try with travis

---
 includes/tuque_wrapper.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/includes/tuque_wrapper.inc b/includes/tuque_wrapper.inc
index a73cadb3..54c0b0d5 100644
--- a/includes/tuque_wrapper.inc
+++ b/includes/tuque_wrapper.inc
@@ -254,12 +254,13 @@ class IslandoraFedoraObject extends FedoraObject {
     }
     catch (Exception $e) {
       if ($e instanceof DatastreamExistsException && variable_get('islandora_deprecation_return_false_when_datastream_exists', TRUE)) {
-        $message = format_string('Returning FALSE on ingestDatastream() is deprecated in 7.x-1.10. See https://github.com/Islandora/islandora/pull/680/.
-          The datastream @dsid already exists on the object: @pid.', array(
-            '@dsid' => $datastream->id,
-            '@pid' => $object->id,
-          ));
-        trigger_error(filter_xss($message), E_USER_DEPRECATED);
+        $message_deprecated = format_string('Returning FALSE on ingestDatastream() is deprecated in islandora:7.x-1.10. See https://github.com/Islandora/islandora/pull/680/');
+        $message_error = format_string('The datastream @dsid already exists on the object: @pid.', array(
+          '@dsid' => $datastream->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</br>code: @code<br/>message: @msg', array(