summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-08-24 12:17:41 -0300
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-08-24 12:17:41 -0300
commit6cdc7a0aab0178097a79425244df0b051e44991c (patch)
tree96c9ccfee0bc5494ea66863258ed220955b9a164
parent62159e0556b2ae46cde4d7174067e02c27e1ad6c (diff)
parent716e31ebce9c695775100f3e35244108b1cbc204 (diff)
downloadaskbot-6cdc7a0aab0178097a79425244df0b051e44991c.tar.gz
askbot-6cdc7a0aab0178097a79425244df0b051e44991c.tar.bz2
askbot-6cdc7a0aab0178097a79425244df0b051e44991c.zip
Merge branch 'avatars-sidebar' into testing
-rw-r--r--askbot/migrations/0043_add_has_valid_gravatar.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/askbot/migrations/0043_add_has_valid_gravatar.py b/askbot/migrations/0043_add_has_valid_gravatar.py
index 8d15f062..6f37b94c 100644
--- a/askbot/migrations/0043_add_has_valid_gravatar.py
+++ b/askbot/migrations/0043_add_has_valid_gravatar.py
@@ -7,13 +7,16 @@ from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
- db.add_column(
- u'auth_user',
- 'has_valid_gravatar',
- self.gf(
- 'django.db.models.fields.BooleanField'
- )(default = False)
- )
+ try:
+ db.add_column(
+ u'auth_user',
+ 'has_valid_gravatar',
+ self.gf(
+ 'django.db.models.fields.BooleanField'
+ )(default = False)
+ )
+ except:
+ pass
def backwards(self, orm):