From 91585a1fa69e37af84481cf79b86a7bf26627dad Mon Sep 17 00:00:00 2001 From: Trenton H <797416+stumpylog@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:49:54 -0700 Subject: [PATCH] Prefer the metadata JSON file over the version JSON file (#7048) --- src/documents/management/commands/document_importer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/documents/management/commands/document_importer.py b/src/documents/management/commands/document_importer.py index 97b73b743..3535e1476 100644 --- a/src/documents/management/commands/document_importer.py +++ b/src/documents/management/commands/document_importer.py @@ -166,10 +166,7 @@ class Command(CryptMixin, BaseCommand): ) return - if version_path.exists(): - with version_path.open() as infile: - self.version = json.load(infile)["version"] - elif metadata_path.exists(): + if metadata_path.exists(): with metadata_path.open() as infile: data = json.load(infile) self.version = data["version"] @@ -179,6 +176,9 @@ class Command(CryptMixin, BaseCommand): ) elif EXPORTER_CRYPTO_SETTINGS_NAME in data: self.load_crypt_params(data) + elif version_path.exists(): + with version_path.open() as infile: + self.version = json.load(infile)["version"] if self.version and self.version != version.__full_version_str__: self.stdout.write(