Merge branch 'bootstrap' of github.com:TracyWebTech/colab into bootstrap

Sergio Oliveira
2 parents d9d6f997 4272b47a
Showing 2 changed files with 5 additions and 2 deletions Show diff stats
requirements.txt
src/accounts/migrations/0002_delete_sussumu_dup.py
@@ -21,7 +21,7 @@ django-browserid
 git+https://github.com/TracyWebTech/django-revproxy/
  
 # Converse.js (XMPP client)
-django-conversejs==0.2.2
+django-conversejs
  
 # Feedzilla (planet) and deps
 https://bitbucket.org/lorien/feedzilla/get/tip.tar.gz # Temporarily work around
@@ -7,7 +7,10 @@ from django.db import models
 class Migration(DataMigration):
  
     def forwards(self, orm):
-        sussumu = orm['accounts.User'].objects.get(username='Sussumu')
+        try:
+            sussumu = orm['accounts.User'].objects.get(username='Sussumu')
+        except orm['accounts.User'].DoesNotExist:
+            return
         profile = orm['super_archives.UserProfile'].objects.get(user_id=sussumu.pk)
         sussumu.delete()
         profile.delete()
...	...	@@ -21,7 +21,7 @@ django-browserid
21	21	git+https://github.com/TracyWebTech/django-revproxy/
22	22
23	23	# Converse.js (XMPP client)
24		-django-conversejs==0.2.2
	24	+django-conversejs
25	25
26	26	# Feedzilla (planet) and deps
27	27	https://bitbucket.org/lorien/feedzilla/get/tip.tar.gz # Temporarily work around
...	...
...	...	@@ -7,7 +7,10 @@ from django.db import models
7	7	class Migration(DataMigration):
8	8
9	9	def forwards(self, orm):
10		- sussumu = orm['accounts.User'].objects.get(username='Sussumu')
	10	+ try:
	11	+ sussumu = orm['accounts.User'].objects.get(username='Sussumu')
	12	+ except orm['accounts.User'].DoesNotExist:
	13	+ return
11	14	profile = orm['super_archives.UserProfile'].objects.get(user_id=sussumu.pk)
12	15	sussumu.delete()
13	16	profile.delete()
...	...