#
#
# patch "work.cc"
#  from [d7b3ba99d7e2e54be50a7ead7053c3fdcb6ea41f]
#    to [b005a944d5e5ebcbfed43ac742871eba7d5e7ad0]
#
============================================================
--- work.cc	d7b3ba99d7e2e54be50a7ead7053c3fdcb6ea41f
+++ work.cc	b005a944d5e5ebcbfed43ac742871eba7d5e7ad0
@@ -459,8 +459,8 @@ workspace::get_ws_options(options & opts
       opts.dbname = database_option;
     }
 
-  if (!opts.key_dir_given && !opts.conf_dir_given)
-    {
+  if (!opts.key_dir_given && !opts.conf_dir_given && !keydir_option.empty())
+    { // if empty/missing, we want to keep the default
       opts.key_dir = keydir_option;
       opts.key_dir_given = true;
     }