summaryrefslogtreecommitdiffstats
path: root/virtualenv
diff options
context:
space:
mode:
authorThomas NOEL <tnoel@entrouvert.com>2013-12-18 13:47:31 (GMT)
committerThomas NOEL <tnoel@entrouvert.com>2013-12-18 13:47:31 (GMT)
commit5d6fab5fb99a6778befce6a8143d8d62846ac3ac (patch)
tree7a3869accbc855151df8205521b688f5cb3774f7 /virtualenv
parentfec3cb44f2ca30a503da5afad147efeeb2a93498 (diff)
downloadunivnautes-old-5d6fab5fb99a6778befce6a8143d8d62846ac3ac.zip
univnautes-old-5d6fab5fb99a6778befce6a8143d8d62846ac3ac.tar.gz
univnautes-old-5d6fab5fb99a6778befce6a8143d8d62846ac3ac.tar.bz2
authentic 2.1 ; django 1.5
Diffstat (limited to 'virtualenv')
-rwxr-xr-xvirtualenv/build_virtualenv.sh2
-rw-r--r--virtualenv/patches/authentic2-syncmetadata-elementtree.diff32
2 files changed, 1 insertions, 33 deletions
diff --git a/virtualenv/build_virtualenv.sh b/virtualenv/build_virtualenv.sh
index 8c1711a..7edf1ae 100755
--- a/virtualenv/build_virtualenv.sh
+++ b/virtualenv/build_virtualenv.sh
@@ -27,7 +27,7 @@ cd $VE
pip install --upgrade pip
echo "** install packages"
-for p in flup "django<1.5" authentic2
+for p in flup "django<1.6" authentic2
do
pip install "$p"
done
diff --git a/virtualenv/patches/authentic2-syncmetadata-elementtree.diff b/virtualenv/patches/authentic2-syncmetadata-elementtree.diff
deleted file mode 100644
index 8fccc6d..0000000
--- a/virtualenv/patches/authentic2-syncmetadata-elementtree.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit e819eb7e146413eb88fada33b79819216ea463c0
-Author: Benjamin Dauvergne <bdauvergne@entrouvert.com>
-Date: Wed May 30 15:58:49 2012 +0200
-
- element tree node can be equivalent to False, add explicit None test
-
- Patch submitted by Thomas Noël
-
- Fixes #1479
-
-diff --git a/authentic2/saml/management/commands/sync-metadata.py b/authentic2/saml/management/commands/sync-metadata.py
-index 4a58a52..325a34b 100644
---- a/authentic2/saml/management/commands/sync-metadata.py
-+++ b/authentic2/saml/management/commands/sync-metadata.py
-@@ -32,12 +32,13 @@ def load_one_entity(tree, options, sp_policy=None, idp_policy=None):
- entity_id = tree.get(ENTITY_ID)
- organization = tree.find(ORGANIZATION)
- name, org = None, None
-- if organization:
-+ if organization is not None:
- organization_display_name = organization.find(ORGANIZATION_DISPLAY_NAME)
- organization_name = organization.find(ORGANIZATION_NAME)
-- org = organization_display_name or organization_name
-- if org is not None:
-- name = org.text
-+ if organization_display_name is not None:
-+ name = organization_display_name.text
-+ elif organization_name is not None:
-+ name = organization_name.text
- if not name:
- name = entity_id
- idp, sp = False, False