From 5786132ca84952df4f92fe4c7610949db3d4f4f6 Mon Sep 17 00:00:00 2001 From: Marc Date: Sat, 4 Oct 2014 21:31:00 +0000 Subject: [PATCH] deploy.sh: make sure git is installed --- orchestra/apps/domains/tests/functional_tests/tests.py | 2 +- orchestra/bin/orchestra-admin | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/orchestra/apps/domains/tests/functional_tests/tests.py b/orchestra/apps/domains/tests/functional_tests/tests.py index d4fe1dd2..9762c7a9 100644 --- a/orchestra/apps/domains/tests/functional_tests/tests.py +++ b/orchestra/apps/domains/tests/functional_tests/tests.py @@ -197,7 +197,7 @@ class DomainTestMixin(object): self.addCleanup(partial(self.delete, self.domain_name)) self.update(self.domain_name, self.domain_update_records) self.add(self.www_name, self.www_records) - time.sleep(1) + time.sleep(0.5) self.validate_update(self.MASTER_SERVER_ADDR, self.domain_name) time.sleep(5) self.validate_update(self.SLAVE_SERVER_ADDR, self.domain_name) diff --git a/orchestra/bin/orchestra-admin b/orchestra/bin/orchestra-admin index 49ef7102..ca0a250f 100755 --- a/orchestra/bin/orchestra-admin +++ b/orchestra/bin/orchestra-admin @@ -195,14 +195,18 @@ function install_requirements () { run update-rc.d rabbitmq-server defaults # Patch passlib - from collections import OrderedDict - IMPORT="from django.contrib.auth.hashers import mask_hash, _" COLLECTIONS="from collections import OrderedDict" sed -i "s/${IMPORT}, SortedDict/${IMPORT}\n ${COLLECTIONS}/" \ /usr/local/lib/python2.7/dist-packages/passlib/ext/django/utils.py sed -i "s/SortedDict/OrderedDict/g" \ /usr/local/lib/python2.7/dist-packages/passlib/ext/django/utils.py + + # Patch dateutil + sed -i "s/elif not isinstance(dt2, datetime.datetime):/else:/" \ + /usr/local/lib/python2.7/dist-packages/dateutil/relativedelta.py + sed -i "s/if not type(dt1) == type(dt2): #isinstance(dt1, type(dt2)):/if not isinstance(dt2, type(dt1)):/" \ + /usr/local/lib/python2.7/dist-packages/dateutil/relativedelta.py } export -f install_requirements