From 2ffe3940e6996476aa9a3bc263a8990f822072e6 Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Tue, 28 Jan 2020 10:52:19 -0800 Subject: [PATCH] Update OutOfDate message to show actual argument. --- etiquette/exceptions.py | 2 +- etiquette/photodb.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/etiquette/exceptions.py b/etiquette/exceptions.py index 22d7202..38e08c7 100644 --- a/etiquette/exceptions.py +++ b/etiquette/exceptions.py @@ -166,7 +166,7 @@ class BadDataDirectory(EtiquetteException): OUTOFDATE = ''' 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() class DatabaseOutOfDate(EtiquetteException): ''' diff --git a/etiquette/photodb.py b/etiquette/photodb.py index 2acd449..cb6778d 100644 --- a/etiquette/photodb.py +++ b/etiquette/photodb.py @@ -1349,7 +1349,11 @@ class PhotoDB( ''' existing = self.sql_execute('PRAGMA user_version').fetchone()[0] 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): self.log.debug('Running first-time database setup.')