From fceadaf1f253b8ab5d9a54097b3d5e2ea93f554d Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Mon, 19 May 2014 18:58:13 -0400
Subject: [PATCH] Kombu also requires ordereddict backport to support
 python2.6, more eggs.

---
 eggs.ini                   | 1 +
 lib/galaxy/queue_worker.py | 3 ++-
 lib/galaxy/queues.py       | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/eggs.ini b/eggs.ini
index c78e3fb055b..12a76dcfb24 100644
--- a/eggs.ini
+++ b/eggs.ini
@@ -51,6 +51,7 @@ mock = 1.0.1
 nose = 0.11.1
 NoseHTML = 0.4.1
 NoseTestDiff = 0.1
+ordereddict = 1.1
 paramiko = 1.11.1
 Parsley = 1.1
 Paste = 1.7.5.1
diff --git a/lib/galaxy/queue_worker.py b/lib/galaxy/queue_worker.py
index 9ab2e3be66c..ef75ddd5863 100644
--- a/lib/galaxy/queue_worker.py
+++ b/lib/galaxy/queue_worker.py
@@ -10,8 +10,9 @@ import sys
 import galaxy.queues
 from galaxy import eggs, util
 if sys.version_info < (2, 7, 0):
-    # Kombu requires importlib to function under Python 2.6.
+    # Kombu requires importlib and ordereddict to function under Python 2.6.
     eggs.require('importlib')
+    eggs.require('ordereddict')
 eggs.require('kombu')
 
 from kombu import Connection
diff --git a/lib/galaxy/queues.py b/lib/galaxy/queues.py
index 0b0b8c1e419..fc585459bb7 100644
--- a/lib/galaxy/queues.py
+++ b/lib/galaxy/queues.py
@@ -9,8 +9,9 @@ import sys
 from galaxy import eggs
 
 if sys.version_info < (2, 7, 0):
-    # Kombu requires importlib to function in Python 2.6.
+    # Kombu requires importlib and ordereddict to function in Python 2.6.
     eggs.require('importlib')
+    eggs.require('ordereddict')
 eggs.require('kombu')
 from kombu import Exchange, Queue