Changeset 8235

Timestamp:

26/10/12 11:37:38 (8 years ago)

Author:

pjkersha

Message:

 

Location:

branches/ndg_security-2.2.x

Files:

• Makefile (modified) (4 diffs)
• ndg_security_server/ndg/security/server/xacml/pip/saml_pip.py (modified) (2 diffs)

branches/ndg_security-2.2.x/Makefile

@@ -10 +10 @@
 # @license: BSD - LICENSE file
 #
-# $Id:$
+# $Id$
 EGG_DIRS=ndg_security_common ndg_security_client ndg_security_server \
 ndg_security_test ndg_security
@@ -22 +22 @@
                 cd $$dir; \
                 ${PYTHON} setup.py bdist_egg; \
+                ${PYTHON} setup.py sdist; \
                 cd ..; \
         done;
@@ -36 +37 @@
                 cd $$dir; \
                 rm -f dist/*.egg; \
+                rm -f dist/*.tar.gz; \
                 rm -rf *.egg-info; \
                 rm -rf build; \
@@ -53 +55 @@
         @echo "Installing eggs to ${NDG_EGG_DIST_HOST}:${NDG_EGG_DIST_DIR} ..."
         scp ndg_security*/dist/*.egg ${NDG_EGG_DIST_USER}@${NDG_EGG_DIST_HOST}:${NDG_EGG_DIST_DIR}
+        scp ndg_security*/dist/*.tar.gz ${NDG_EGG_DIST_USER}@${NDG_EGG_DIST_HOST}:${NDG_EGG_DIST_DIR}
         ssh ${NDG_EGG_DIST_USER}@${NDG_EGG_DIST_HOST} "chown ${NDG_EGG_DIST_USER}:cedadev ${NDG_EGG_DIST_DIR}/ndg_security*.egg"
+        ssh ${NDG_EGG_DIST_USER}@${NDG_EGG_DIST_HOST} "chown ${NDG_EGG_DIST_USER}:cedadev ${NDG_EGG_DIST_DIR}/ndg_security*.tar.gz"
 
 # Make ZSI stubs from Session Manager WSDL

branches/ndg_security-2.2.x/ndg_security_server/ndg/security/server/xacml/pip/saml_pip.py

@@ -8 +8 @@
 __license__ = "BSD - see LICENSE file in top-level directory"
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
-__revision__ = '$Id:$'
+__revision__ = '$Id$'
 import logging
 log = logging.getLogger(__name__)
@@ -406 +406 @@
             _line = path.expandvars(line).strip()
             if _line and not _line.startswith('#'):
-                attributeId, attributeAuthorityURI = _line.split()
+                attributeId, attributeAuthorityURI = _line.split(',')
                 self.__attributeId2AttributeAuthorityMap[attributeId
                                                        ] = attributeAuthorityURI