aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2012-01-29 17:05:16 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2012-01-29 17:05:16 -0600
commit396f39c3e9e5346b4b2e86f6bcce9cdb0c6ee683 (patch)
tree162fe8472ae396e59bf439963efa42f47118d68d
parent16d4dce9e94644ba783d7ca8d4f87e75420ce3d9 (diff)
downloadmediagoblin-396f39c3e9e5346b4b2e86f6bcce9cdb0c6ee683.tar.lz
mediagoblin-396f39c3e9e5346b4b2e86f6bcce9cdb0c6ee683.tar.xz
mediagoblin-396f39c3e9e5346b4b2e86f6bcce9cdb0c6ee683.zip
Fix database_current_version for when self.migration_data is None.
-rw-r--r--mediagoblin/db/sql/util.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/db/sql/util.py b/mediagoblin/db/sql/util.py
index 87234019..cb8fbf0d 100644
--- a/mediagoblin/db/sql/util.py
+++ b/mediagoblin/db/sql/util.py
@@ -97,6 +97,10 @@ class MigrationManager(object):
if not self.migration_table.exists(self.database.bind):
return None
+ # Also return None if self.migration_data is None.
+ if self.migration_data is None:
+ return None
+
return self.migration_data.version
def set_current_migration(self, migration_number):