Merge branch 'master' into senslab2

[sfa.git] / sfa / util / xrn.py

diff --git a/sfa/util/xrn.py b/sfa/util/xrn.py
index e3871b5..08a257d 100644 (file)
--- a/sfa/util/xrn.py
+++ b/sfa/util/xrn.py
@@ -227,14 +227,15 @@ class Xrn:
         if self.type and self.type.startswith('authority'):
             self.authority = Xrn.hrn_auth_list(self.hrn)
             leaf = self.get_leaf() 
-            if not self.authority:
-                self.authority = [self.hrn]
+            #if not self.authority:
+            #    self.authority = [self.hrn]
             type_parts = self.type.split("+")
             self.type = type_parts[0]
             name = 'sa'
             if len(type_parts) > 1:
                 name = type_parts[1]
-            authority_string = ":".join([self.get_authority_urn(), leaf])
+            auth_parts = [part for part in [self.get_authority_urn(), leaf] if part]  
+            authority_string = ":".join(auth_parts)
         else:
             self.authority = Xrn.hrn_auth_list(self.hrn)
             name = Xrn.hrn_leaf(self.hrn)