From e4290b5492a953f881114b65e6025fbbb7707122 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>

Date: Wed, 9 Oct 2013 12:04:27 +0100

Subject: [PATCH] Use updated parallel install versions of el6 packages

---

 swift/__init__.py |   25 +++++++++++++++++++++++++

 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/swift/__init__.py b/swift/__init__.py

index 7e8fb7b..3a11a77 100644

--- a/swift/__init__.py

+++ b/swift/__init__.py

@@ -12,6 +12,31 @@

 # implied.

 # See the License for the specific language governing permissions and

 # limitations under the License.

+import sys

+import pkg_resources

+

+# If there is a conflicting non egg module,

+# i.e. an older standard system module installed,

+# then replace it with this requirement

+def replace_dist(requirement):

+    try:

+        return pkg_resources.require(requirement)

+    except pkg_resources.VersionConflict:

+        e = sys.exc_info()[1]

+        dist=e.args[0]

+        req=e.args[1]

+        if dist.key == req.key and not dist.location.endswith('.egg'):

+            del pkg_resources.working_set.by_key[dist.key]

+            # We assume there is no need to adjust sys.path

+            # and the associated pkg_resources.working_set.entries

+            return pkg_resources.require(requirement)

+

+replace_dist("PasteDeploy >= 1.5.0")

+# This hack is needed because replace_dist() results in

+# the standard paste module path being at the start of __path__.

+# TODO: See can we get pkg_resources to do the right thing directly

+import paste

+paste.__path__.insert(0, paste.__path__.pop(-1))

 import os

 import gettext