reverted changes to prevent merge conflicts

This commit is contained in:
Andreas Preikschat 2013-07-03 19:04:45 +02:00
parent e75a87c5c9
commit 97a4bdf286

View File

@ -105,8 +105,7 @@ def upgrade_db(url, upgrade):
if version > upgrade.__version__: if version > upgrade.__version__:
return version, upgrade.__version__ return version, upgrade.__version__
version += 1 version += 1
#FIXME: python3 - dislable upgrade if load_changes:
if load_changes and False:
while hasattr(upgrade, u'upgrade_%d' % version): while hasattr(upgrade, u'upgrade_%d' % version):
log.debug(u'Running upgrade_%d', version) log.debug(u'Running upgrade_%d', version)
try: try: