Merged trunk into branch. -r 17471:17503

diff --git a/Makefile b/Makefile
index b3602ed..3d3fc9a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ keyconvert-clean:
 python: 
 
 xmlbuilder-install:
-       cd xmlbuilder-0.9 ; python setup.py install ; cd ..
-       
+       cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd -
+
 python-install:
        python setup.py install --root=$(DESTDIR)
        chmod 444 $(DESTDIR)/etc/sfa/default_config.xml

diff --git a/sfa/util/faults.py b/sfa/util/faults.py
index 045e443..8e5ece1 100644 (file)
--- a/sfa/util/faults.py
+++ b/sfa/util/faults.py
@@ -11,7 +11,7 @@ import xmlrpclib
 class SfaFault(xmlrpclib.Fault):
     def __init__(self, faultCode, faultString, extra = None):
         if extra:
-            faultString += ": " + extra
+            faultString += ": " + str(extra)
         xmlrpclib.Fault.__init__(self, faultCode, faultString)
 
 class SfaInvalidAPIMethod(SfaFault):

diff --git a/sfa/util/namespace.py b/sfa/util/namespace.py
index cc140d5..e3a7536 100644 (file)
--- a/sfa/util/namespace.py
+++ b/sfa/util/namespace.py
@@ -45,7 +45,7 @@ def slicename_to_hrn(auth_hrn, slicename):
 def email_to_hrn(auth_hrn, email):
     parts = email.split("@")
     username = parts[0]
-    username = username.replace(".", "_") 
+    username = username.replace(".", "_").replace("+", "_") 
     person_hrn = ".".join([auth_hrn, username])
     
     return person_hrn 

diff --git a/sfa/util/table.py b/sfa/util/table.py
index 7eea14a..bccda20 100644 (file)
--- a/sfa/util/table.py
+++ b/sfa/util/table.py
@@ -186,5 +186,5 @@ class SfaTable(list):
             except:
                 pass
     
-    def sfa_records_purge():
+    def sfa_records_purge(self):
         self.drop()