From fbfd85165caf9f4ac73236aa4380549c9eb7306d Mon Sep 17 00:00:00 2001
From: Ryan Williams <rdw@lindenlab.com>
Date: Sat, 6 Oct 2007 04:07:27 +0000
Subject: [PATCH] Little trick to further sweep SL-56900 under the rug. Not
reviewed, I wish this were otherwise, but it needs to be committed to release
so the osiris external can pick it up and I don't want to have to manually
create /var/www/.python-eggs anymore.
---
indra/lib/python/indra/base/llsd.py | 3 ++-
indra/lib/python/indra/base/lluuid.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/lib/python/indra/base/llsd.py b/indra/lib/python/indra/base/llsd.py
index e23cdfa986..9e636ea423 100644
--- a/indra/lib/python/indra/base/llsd.py
+++ b/indra/lib/python/indra/base/llsd.py
@@ -838,8 +838,9 @@ undef = LLSD(None)
# register converters for stacked, if stacked is available
try:
from mulib import stacked
+ stacked.NoProducer() # just to exercise stacked
except:
- print "Not able to import stacked, skipping registering llsd converters."
+ print "Couldn't import mulib.stacked, not registering LLSD converters"
else:
def llsd_convert_json(llsd_stuff, request):
callback = request.get_header('callback')
diff --git a/indra/lib/python/indra/base/lluuid.py b/indra/lib/python/indra/base/lluuid.py
index ea60ae74c2..f302f8b002 100644
--- a/indra/lib/python/indra/base/lluuid.py
+++ b/indra/lib/python/indra/base/lluuid.py
@@ -279,8 +279,9 @@ def uuid_bits_to_uuid(bits):
try:
from mulib import stacked
+ stacked.NoProducer() # just to exercise stacked
except:
- print "Couldn't import mulib, not registering UUID converter"
+ print "Couldn't import mulib.stacked, not registering UUID converter"
else:
def convertUUID(uuid, req):
req.write(str(uuid))
--
GitLab