voussoir
/
etiquette
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update OutOfDate message to show actual argument.

master
voussoir 2020-01-28 10:52:19 -08:00
parent 93eb693bee
commit 2ffe3940e6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etiquette/exceptions.py
View File

@ -166,7 +166,7 @@ class BadDataDirectory(EtiquetteException):
OUTOFDATE = ''' OUTOFDATE = '''
Database is out of date. {existing} should be {new}. Database is out of date. {existing} should be {new}.
Please use utilities\\database_upgrader\\database_upgrader.py Please run utilities\\database_upgrader\\database_upgrader.py "{filepath.absolute_path}"
'''.strip() '''.strip()
class DatabaseOutOfDate(EtiquetteException): class DatabaseOutOfDate(EtiquetteException):
''' '''

6
etiquette/photodb.py
View File

@ -1349,7 +1349,11 @@ class PhotoDB(
''' '''
existing = self.sql_execute('PRAGMA user_version').fetchone()[0] existing = self.sql_execute('PRAGMA user_version').fetchone()[0]
if existing != constants.DATABASE_VERSION: if existing != constants.DATABASE_VERSION:
raise exceptions.DatabaseOutOfDate(existing=existing, new=constants.DATABASE_VERSION) raise exceptions.DatabaseOutOfDate(
existing=existing,
new=constants.DATABASE_VERSION,
filepath=self.database_filepath,
)
def _first_time_setup(self): def _first_time_setup(self):
self.log.debug('Running first-time database setup.') self.log.debug('Running first-time database setup.')