From 3872e7ae649f42d849de472a7dbf78a241d54407 Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Tue, 29 Dec 2020 09:47:03 -0800
Subject: [PATCH] Fixed --exiftool-path to work with
 --exiftool-merge-keywords/persons

---
 osxphotos/__main__.py | 6 +++---
 osxphotos/_version.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osxphotos/__main__.py b/osxphotos/__main__.py
index cc71c42f..573964bf 100644
--- a/osxphotos/__main__.py
+++ b/osxphotos/__main__.py
@@ -1822,7 +1822,7 @@ def export(
         ("exiftool_option", ("exiftool")),
         ("exiftool_merge_keywords", ("exiftool", "sidecar")),
         ("exiftool_merge_persons", ("exiftool", "sidecar")),
-        ("exiftool_path", ("exiftool")),
+        ("exiftool_path", ("exiftool", "exiftool_merge_keywords", "exiftool_merge_persons")),
     ]
     try:
         cfg.validate(exclusive=exclusive_options, dependent=dependent_options, cli=True)
@@ -1892,7 +1892,7 @@ def export(
     ]
 
     # verify exiftool installed and in path if path not provided
-    if exiftool and not exiftool_path:
+    if (exiftool or exiftool_merge_keywords or exiftool_merge_persons) and not exiftool_path:
         try:
             exiftool_path = get_exiftool_path()
         except FileNotFoundError:
@@ -1906,7 +1906,7 @@ def export(
             )
             ctx.exit(2)
 
-    if exiftool:
+    if exiftool or exiftool_merge_keywords or exiftool_merge_persons:
         verbose_(f"exiftool path: {exiftool_path}")
 
     isphoto = ismovie = True  # default searches for everything
diff --git a/osxphotos/_version.py b/osxphotos/_version.py
index 88b59c42..3632b8de 100644
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,5 +1,5 @@
 """ version info """
 
-__version__ = "0.38.20"
+__version__ = "0.38.21"