From 33d8911b69ae5e4227e22504cbceb6fe9afd4f90 Mon Sep 17 00:00:00 2001
From: Jonathan Green <jonathan@discoverygarden.ca>
Date: Wed, 15 May 2013 19:35:05 +0000
Subject: [PATCH 1/3] Attempt to fix travis

---
 includes/ingest.form.inc      |  2 +-
 tests/scripts/travis_setup.sh | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc
index a2d5a833..c9a615ce 100644
--- a/includes/ingest.form.inc
+++ b/includes/ingest.form.inc
@@ -78,7 +78,7 @@ function islandora_ingest_form_init_form_state_storage(array &$form_state, array
     if (empty($objects)) {
       $objects[] = islandora_ingest_form_prepare_new_object($configuration);
     }
-    // No need to persist the 'objects' within the configuration.
+    // No need to persist the objects within the configuration.
     unset($configuration['objects']);
     // Required for step hooks.
     $configuration['models'] = isset($configuration['models']) ? $configuration['models'] : array();
diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh
index 7939215b..354e4d6b 100755
--- a/tests/scripts/travis_setup.sh
+++ b/tests/scripts/travis_setup.sh
@@ -11,12 +11,11 @@ cd islandora_tomcat
 export CATALINA_HOME='.'
 ./bin/startup.sh
 cd $HOME
-pyrus channel-discover pear.drush.org
-pyrus channel-discover pear.phpqatools.org
-pyrus channel-discover pear.netpirates.net
-pyrus install drush/drush
-pyrus install pear/PHP_CodeSniffer
-pyrus install pear.phpunit.de/phpcpd
+pear channel-discover pear.phpqatools.org
+pear channel-discover pear.netpirates.net
+pear install pear/PHP_CodeSniffer
+pear install pear.phpunit.de/phpcpd
+sudo apt-get install -qq drush
 phpenv rehash
 drush dl --yes drupal
 cd drupal-*

From 522cac6e7172097c6359361f7901b0a067d2bacd Mon Sep 17 00:00:00 2001
From: jonathangreen <jonathan@discoverygarden.ca>
Date: Wed, 15 May 2013 21:48:34 -0300
Subject: [PATCH 2/3] Another attempt to appease the travis gods.

---
 tests/scripts/travis_setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh
index 354e4d6b..dab4508f 100755
--- a/tests/scripts/travis_setup.sh
+++ b/tests/scripts/travis_setup.sh
@@ -11,11 +11,12 @@ cd islandora_tomcat
 export CATALINA_HOME='.'
 ./bin/startup.sh
 cd $HOME
+pear update pear
 pear channel-discover pear.phpqatools.org
 pear channel-discover pear.netpirates.net
 pear install pear/PHP_CodeSniffer
 pear install pear.phpunit.de/phpcpd
-sudo apt-get install -qq drush
+pear install drush/drush
 phpenv rehash
 drush dl --yes drupal
 cd drupal-*

From 1533de776e6c3d1e40d2a7120baa671730bc0dc8 Mon Sep 17 00:00:00 2001
From: jonathangreen <jonathan@discoverygarden.ca>
Date: Wed, 15 May 2013 21:59:32 -0300
Subject: [PATCH 3/3] Yet another attempt to appease the travis gods.

---
 includes/ingest.form.inc      | 2 +-
 tests/scripts/travis_setup.sh | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/includes/ingest.form.inc b/includes/ingest.form.inc
index 62658acd..3ef3f847 100644
--- a/includes/ingest.form.inc
+++ b/includes/ingest.form.inc
@@ -78,7 +78,7 @@ function islandora_ingest_form_init_form_state_storage(array &$form_state, array
     if (empty($objects)) {
       $objects[] = islandora_ingest_form_prepare_new_object($configuration);
     }
-    // Make sure the models actually exist
+    // Make sure the models actually exist.
     foreach ($configuration['models'] as $key => $model) {
       if (!islandora_object_load($model)) {
         unset($configuration['models'][$key]);
diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh
index dab4508f..45dc3ab9 100755
--- a/tests/scripts/travis_setup.sh
+++ b/tests/scripts/travis_setup.sh
@@ -11,7 +11,11 @@ cd islandora_tomcat
 export CATALINA_HOME='.'
 ./bin/startup.sh
 cd $HOME
-pear update pear
+pear upgrade –force Console_Getopt
+pear upgrade –force pear
+pear upgrade-all
+pear channel-discover pear.drush.org
+pear channel-discover pear.drush.org
 pear channel-discover pear.phpqatools.org
 pear channel-discover pear.netpirates.net
 pear install pear/PHP_CodeSniffer